Skip to content

Commit 1c369b6

Browse files
committed
kbuild: simplify generic vdso installation code
With commit 4b0bf9a ("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 <[email protected]>
1 parent d98dba8 commit 1c369b6

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

scripts/Makefile.vdsoinst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ install-dir := $(MODLIB)/vdso
1313

1414
define gen_install_rules
1515

16-
src := $$(firstword $$(subst :,$(space),$(1)))
17-
dest := $(install-dir)/$$(or $$(word 2,$$(subst :,$(space),$(1))),$$(patsubst %.dbg,%,$$(notdir $(1))))
16+
dest := $(install-dir)/$$(patsubst %.dbg,%,$$(notdir $(1)))
1817

1918
__default: $$(dest)
20-
$$(dest): $$(src) FORCE
19+
$$(dest): $(1) FORCE
2120
$$(call cmd,install)
2221

2322
# Some architectures create .build-id symlinks
2423
ifneq ($(filter arm sparc x86, $(SRCARCH)),)
25-
link := $(install-dir)/.build-id/$$(shell $(READELF) -n $$(src) | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug
24+
link := $(install-dir)/.build-id/$$(shell $(READELF) -n $(1) | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug
2625

2726
__default: $$(link)
2827
$$(link): $$(dest) FORCE

0 commit comments

Comments
 (0)