Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

module: allow UNUSED_KSYMS_WHITELIST to be relative against objtree.

If UNUSED_KSYMS_WHITELIST is a file generated
before Kbuild runs, and the source tree is in
a read-only filesystem, the developer must put
the file somewhere and specify an absolute
path to UNUSED_KSYMS_WHITELIST. This worked,
but if IKCONFIG=y, an absolute path is embedded
into .config and eventually into vmlinux, causing
the build to be less reproducible when building
on a different machine.

This patch makes the handling of
UNUSED_KSYMS_WHITELIST to be similar to
MODULE_SIG_KEY.

First, check if UNUSED_KSYMS_WHITELIST is an
absolute path, just as before this patch. If so,
use the path as is.

If it is a relative path, use wildcard to check
the existence of the file below objtree first.
If it does not exist, fall back to the original
behavior of adding $(srctree)/ before the value.

After this patch, the developer can put the generated
file in objtree, then use a relative path against
objtree in .config, eradicating any absolute paths
that may be evaluated differently on different machines.

Signed-off-by: Yifan Hong <elsk@google.com>
Reviewed-by: Elliot Berman <quic_eberman@quicinc.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

authored by

Yifan Hong and committed by
Luis Chamberlain
8d0b7288 a5131c3f

+2 -2
+1 -1
kernel/module/Kconfig
··· 392 392 exported at all times, even in absence of in-tree users. The value to 393 393 set here is the path to a text file containing the list of symbols, 394 394 one per line. The path can be absolute, or relative to the kernel 395 - source tree. 395 + source or obj tree. 396 396 397 397 config MODULES_TREE_LOOKUP 398 398 def_bool y
+1 -1
scripts/Makefile.modpost
··· 94 94 95 95 ifdef CONFIG_TRIM_UNUSED_KSYMS 96 96 ksym-wl := $(CONFIG_UNUSED_KSYMS_WHITELIST) 97 - ksym-wl := $(if $(filter-out /%, $(ksym-wl)),$(srctree)/)$(ksym-wl) 97 + ksym-wl := $(if $(filter-out /%, $(ksym-wl)),$(if $(wildcard $(ksym-wl)),,$(srctree)/))$(ksym-wl) 98 98 modpost-args += -t $(addprefix -u , $(ksym-wl)) 99 99 modpost-deps += $(ksym-wl) 100 100 endif