| Message ID | 20240429150754.3178262-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1c369b6c9492756c58ad4abb92a9433a59f31f7d |
| Headers | show |
| Series | kbuild: simplify generic vdso installation code | expand |
Hello: This patch was applied to riscv/linux.git (fixes) by Masahiro Yamada <masahiroy@kernel.org>: On Tue, 30 Apr 2024 00:07:54 +0900 you wrote: > With commit 4b0bf9a01270 ("riscv: compat_vdso: install compat_vdso.so.dbg > to /lib/modules/*/vdso/") applied, all debug VDSO files are installed in > $(MODLIB)/vdso/. > > Simplify the installation rule. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > [...] Here is the summary with links: - kbuild: simplify generic vdso installation code https://git.kernel.org/riscv/c/1c369b6c9492 You are awesome, thank you!
diff --git a/scripts/Makefile.vdsoinst b/scripts/Makefile.vdsoinst index c477d17b0aa5..bf72880c50d0 100644 --- a/scripts/Makefile.vdsoinst +++ b/scripts/Makefile.vdsoinst @@ -13,16 +13,15 @@ install-dir := $(MODLIB)/vdso define gen_install_rules -src := $$(firstword $$(subst :,$(space),$(1))) -dest := $(install-dir)/$$(or $$(word 2,$$(subst :,$(space),$(1))),$$(patsubst %.dbg,%,$$(notdir $(1)))) +dest := $(install-dir)/$$(patsubst %.dbg,%,$$(notdir $(1))) __default: $$(dest) -$$(dest): $$(src) FORCE +$$(dest): $(1) FORCE $$(call cmd,install) # Some architectures create .build-id symlinks ifneq ($(filter arm sparc x86, $(SRCARCH)),) -link := $(install-dir)/.build-id/$$(shell $(READELF) -n $$(src) | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug +link := $(install-dir)/.build-id/$$(shell $(READELF) -n $(1) | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug __default: $$(link) $$(link): $$(dest) FORCE
With commit 4b0bf9a01270 ("riscv: compat_vdso: install compat_vdso.so.dbg to /lib/modules/*/vdso/") applied, all debug VDSO files are installed in $(MODLIB)/vdso/. Simplify the installation rule. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/Makefile.vdsoinst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)