History

kbuild: add $(objtree)/ prefix to some in-kernel build artifacts

$(objtree) refers to the top of the output directory of kernel builds. This commit adds the explicit $(objtree)/ prefix to build artifacts needed for building external modules. This change has no immediate impact, as the top-level Makefile currently defines: objtree := . This commit prepares for supporting the building of external modules in a different directory.

Masahiro Yamada committed 2 years ago

Commit 214c0ee1 parent 0afd73c11 files · +30 −30Browse files

Showing the changes to scripts (6 of 11 files). Show all

Unified · Split

6 files
  1. scripts/Kbuild.include +1 −1
  2. scripts/Makefile.build +2 −2
  3. scripts/Makefile.modfinal +7 −7
  4. scripts/Makefile.modinst +1 −1
  5. scripts/Makefile.modpost +6 −6
  6. scripts/depmod.sh +2 −2
scripts/Kbuild.include+1−1
@@ -205,7 +205,7 @@ if_changed_dep = $(if $(if-changed-cond),$(cmd_and_fixdep),@:) · 204 unmodified lines
205205
206206 cmd_and_fixdep = \
207207 $(cmd); \
208− scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).cmd;\
208+ $(objtree)/scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).cmd;\
209209 rm -f $(depfile)
210210
211211 # Usage: $(call if_changed_rule,foo)
scripts/Makefile.build+2−2
@@ -34,7 +34,7 @@ subdir-asflags-y := · 33 unmodified lines
3434 subdir-ccflags-y :=
3535
3636 # Read auto.conf if it exists, otherwise ignore
37−-include include/config/auto.conf
37+-include $(objtree)/include/config/auto.conf
3838
3939 include $(srctree)/scripts/Kbuild.include
4040 include $(srctree)/scripts/Makefile.compiler
@@ -107,7 +107,7 @@ cmd_cpp_i_c = $(CPP) $(c_flags) -o $@ $< · 66 unmodified lines
107107 $(obj)/%.i: $(obj)/%.c FORCE
108108 $(call if_changed_dep,cpp_i_c)
109109
110−genksyms = scripts/genksyms/genksyms \
110+genksyms = $(objtree)/scripts/genksyms/genksyms \
111111 $(if $(1), -T $(2)) \
112112 $(if $(KBUILD_PRESERVE), -p) \
113113 -r $(or $(wildcard $(2:.symtypes=.symref)), /dev/null)
scripts/Makefile.modfinal+7−7
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 PHONY := __modfinal
77 __modfinal:
88
9−include include/config/auto.conf
9+include $(objtree)/include/config/auto.conf
1010 include $(srctree)/scripts/Kbuild.include
1111
1212 # for c_flags
@@ -37,15 +37,15 @@ quiet_cmd_ld_ko_o = LD [M] $@ · 24 unmodified lines
3737 cmd_ld_ko_o = \
3838 $(LD) -r $(KBUILD_LDFLAGS) \
3939 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \
40− -T scripts/module.lds -o $@ $(filter %.o, $^)
40+ -T $(objtree)/scripts/module.lds -o $@ $(filter %.o, $^)
4141
4242 quiet_cmd_btf_ko = BTF [M] $@
4343 cmd_btf_ko = \
44− if [ ! -f vmlinux ]; then \
44+ if [ ! -f $(objtree)/vmlinux ]; then \
4545 printf "Skipping BTF generation for %s due to unavailability of vmlinux\n" $@ 1>&2; \
4646 else \
47− LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) $(MODULE_PAHOLE_FLAGS) --btf_base vmlinux $@; \
48− $(RESOLVE_BTFIDS) -b vmlinux $@; \
47+ LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) $(MODULE_PAHOLE_FLAGS) --btf_base $(objtree)/vmlinux $@; \
48+ $(RESOLVE_BTFIDS) -b $(objtree)/vmlinux $@; \
4949 fi;
5050
5151 # Same as newer-prereqs, but allows to exclude specified extra dependencies
@@ -57,8 +57,8 @@ if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \ · 5 unmodified lines
5757 printf '%s\n' 'savedcmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:)
5858
5959 # Re-generate module BTFs if either module's .ko or vmlinux changed
60−%.ko: %.o %.mod.o $(extmod_prefix).module-common.o scripts/module.lds $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),vmlinux) FORCE
61− +$(call if_changed_except,ld_ko_o,vmlinux)
60+%.ko: %.o %.mod.o $(extmod_prefix).module-common.o $(objtree)/scripts/module.lds $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),$(objtree)/vmlinux) FORCE
61+ +$(call if_changed_except,ld_ko_o,$(objtree)/vmlinux)
6262 ifdef CONFIG_DEBUG_INFO_BTF_MODULES
6363 +$(if $(newer-prereqs),$(call cmd,btf_ko))
6464 endif
scripts/Makefile.modinst+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 PHONY := __modinst
77 __modinst:
88
9−include include/config/auto.conf
9+include $(objtree)/include/config/auto.conf
1010 include $(srctree)/scripts/Kbuild.include
1111
1212 install-y :=
scripts/Makefile.modpost+6−6
@@ -35,10 +35,10 @@ · 34 unmodified lines
3535 PHONY := __modpost
3636 __modpost:
3737
38−include include/config/auto.conf
38+include $(objtree)/include/config/auto.conf
3939 include $(srctree)/scripts/Kbuild.include
4040
41−MODPOST = scripts/mod/modpost
41+MODPOST = $(objtree)/scripts/mod/modpost
4242
4343 modpost-args = \
4444 $(if $(CONFIG_MODULES),-M) \
@@ -119,11 +119,11 @@ include $(kbuild-file) · 74 unmodified lines
119119
120120 output-symdump := $(KBUILD_EXTMOD)/Module.symvers
121121
122−ifeq ($(wildcard Module.symvers),)
123−missing-input := Module.symvers
122+ifeq ($(wildcard $(objtree)/Module.symvers),)
123+missing-input := $(objtree)/Module.symvers
124124 else
125−modpost-args += -i Module.symvers
126−modpost-deps += Module.symvers
125+modpost-args += -i $(objtree)/Module.symvers
126+modpost-deps += $(objtree)/Module.symvers
127127 endif
128128
129129 modpost-args += -e $(addprefix -i , $(KBUILD_EXTRA_SYMBOLS))
scripts/depmod.sh+2−2
@@ -12,7 +12,7 @@ KERNELRELEASE=$1 · 11 unmodified lines
1212
1313 : ${DEPMOD:=depmod}
1414
15−if ! test -r System.map ; then
15+if ! test -r "${objtree}/System.map" ; then
1616 echo "Warning: modules_install: missing 'System.map' file. Skipping depmod." >&2
1717 exit 0
1818 fi
@@ -25,7 +25,7 @@ if [ -z $(command -v $DEPMOD) ]; then · 6 unmodified lines
2525 exit 0
2626 fi
2727
28−set -- -ae -F System.map
28+set -- -ae -F "${objtree}/System.map"
2929 if test -n "$INSTALL_MOD_PATH"; then
3030 set -- "$@" -b "$INSTALL_MOD_PATH"
3131 fi