kbuild: use always-y instead of extra-y
Subsystems (5)
PATCH 1/1 kbuild: use always-y instead of extra-y
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.
---
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(-)
Documentation/devicetree/bindings/Makefile +4 -4
@@ -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
drivers/gpu/drm/i915/Makefile +1 -1
@@ -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')))
scripts/Makefile.lib +5 -5
@@ -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
scripts/gdb/linux/Makefile +1 -1
@@ -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)
Signature · 1 line
2.27.0
Quoted 3 lines · Masahiro Yamada
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.
Quoted 9 lines
Signed-off-by Masahiro Yamada <[email protected]>---
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(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 7 lines · Rob Herring
Quoted 3 lines · Masahiro Yamada
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.
Quoted 12 lines
Glad to see this clarified. I think just tried both and picked one.
Reviewed-by Rob Herring <[email protected]>Quoted 9 lines
Signed-off-by Masahiro Yamada <[email protected]>---
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(-)
Signature · 6 lines
Best Regards Masahiro Yamada _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for kbuild: use always-y instead of extra-y
In reply to Masahiro Yamada== Series Details ==
== Series Details ==
Series: kbuild: use always-y instead of extra-y
URL : https://patchwork.freedesktop.org/series/86094/
State : failure
== Summary ==
Applying: kbuild: use always-y instead of extra-y
error: sha1 information is lacking or useless (scripts/Makefile.lib).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 kbuild: use always-y instead of extra-y When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx