| Message ID | 20210120062351.3011786-1-masahiroy@kernel.org |
|---|---|
| State | Accepted |
| Commit | 2047ace96679a146c8573520a080f9dfa06a2c98 |
| Headers | show |
| Series | kbuild: use always-y instead of extra-y | expand |
On Wed, Jan 20, 2021 at 03:23:51PM +0900, Masahiro Yamada wrote: > As commit d0e628cd817f ("kbuild: doc: clarify the difference between > extra-y and always-y") explained, extra-y should be used for listing > the prerequsites of vmlinux. always-y is a better fix here. prerequisites Glad to see this clarified. I think just tried both and picked one. Reviewed-by: Rob Herring <robh@kernel.org> > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > Documentation/devicetree/bindings/Makefile | 8 ++++---- > drivers/gpu/drm/i915/Makefile | 2 +- > scripts/Makefile.lib | 10 +++++----- > scripts/gdb/linux/Makefile | 2 +- > 4 files changed, 11 insertions(+), 11 deletions(-)
On Thu, Jan 21, 2021 at 6:39 AM Rob Herring <robh@kernel.org> wrote: > > On Wed, Jan 20, 2021 at 03:23:51PM +0900, Masahiro Yamada wrote: > > As commit d0e628cd817f ("kbuild: doc: clarify the difference between > > extra-y and always-y") explained, extra-y should be used for listing > > the prerequsites of vmlinux. always-y is a better fix here. > > prerequisites Thanks. I fixed it up, and applied to linux-kbuild. > Glad to see this clarified. I think just tried both and picked one. > > Reviewed-by: Rob Herring <robh@kernel.org> > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > --- > > > > Documentation/devicetree/bindings/Makefile | 8 ++++---- > > drivers/gpu/drm/i915/Makefile | 2 +- > > scripts/Makefile.lib | 10 +++++----- > > scripts/gdb/linux/Makefile | 2 +- > > 4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile index 8f2b054bec5a..90fcad98984d 100644 --- a/Documentation/devicetree/bindings/Makefile +++ b/Documentation/devicetree/bindings/Makefile @@ -78,10 +78,10 @@ $(obj)/processed-schema.json: $(DT_SCHEMA_FILES) check_dtschema_version FORCE endif -extra-$(CHECK_DT_BINDING) += processed-schema-examples.json -extra-$(CHECK_DTBS) += processed-schema.json -extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES)) -extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES)) +always-$(CHECK_DT_BINDING) += processed-schema-examples.json +always-$(CHECK_DTBS) += processed-schema.json +always-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES)) +always-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES)) # Hack: avoid 'Argument list too long' error for 'make clean'. Remove most of # build artifacts here before they are processed by scripts/Makefile.clean diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 6d9e81ea67f4..938221894d0c 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -294,7 +294,7 @@ no-header-test := \ gvt/mpt.h \ gvt/scheduler.h -extra-$(CONFIG_DRM_I915_WERROR) += \ +always-$(CONFIG_DRM_I915_WERROR) += \ $(patsubst %.h,%.hdrtest, $(filter-out $(no-header-test), \ $(shell cd $(srctree)/$(src) && find * -name '*.h'))) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 4612a887f28e..b8e587a17dcc 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -64,12 +64,12 @@ always-y += $(userprogs-always-y) $(userprogs-always-m) # DTB # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built -extra-y += $(dtb-y) -extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-) +always-y += $(dtb-y) +always-$(CONFIG_OF_ALL_DTBS) += $(dtb-) ifneq ($(CHECK_DTBS),) -extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y)) -extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-)) +always-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y)) +always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-)) endif # Add subdir path @@ -230,7 +230,7 @@ $(obj)/%: $(src)/%_shipped # target: source(s) FORCE # $(if_changed,ld/objcopy/gzip) # -# and add target to extra-y so that we know we have to +# and add target to 'targets' so that we know we have to # read in the saved command line # Linking diff --git a/scripts/gdb/linux/Makefile b/scripts/gdb/linux/Makefile index 124755087510..13903073cbff 100644 --- a/scripts/gdb/linux/Makefile +++ b/scripts/gdb/linux/Makefile @@ -18,7 +18,7 @@ quiet_cmd_gen_constants_py = GEN $@ $(CPP) -E -x c -P $(c_flags) $< > $@ ;\ sed -i '1,/<!-- end-c-headers -->/d;' $@ -extra-y += constants.py +always-y += constants.py $(obj)/constants.py: $(src)/constants.py.in FORCE $(call if_changed_dep,gen_constants_py)
As commit d0e628cd817f ("kbuild: doc: clarify the difference between extra-y and always-y") explained, extra-y should be used for listing the prerequsites of vmlinux. always-y is a better fix here. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- Documentation/devicetree/bindings/Makefile | 8 ++++---- drivers/gpu/drm/i915/Makefile | 2 +- scripts/Makefile.lib | 10 +++++----- scripts/gdb/linux/Makefile | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-)