c6427490ab
This reverts commit 3f13972470.
Reason for revert: relanding change that should be safe to go in on its own. Below is the original commit message.
BACKPORT: FROMGIT: 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>
(cherry picked from commit a2e3c811938b4902725e259c03b2d6c539613992
https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next)
Bug: 333769605
Change-Id: I442bbe5a68fc895619b84b4749f1e97cb88088ea
[elsk: apply change to gen_autoksyms.sh instead because
CONFIG_UNUSED_KSYMS_WHITELIST is parsed there. Revert change
to Makefile.modpost.]
Bug: 342390208
Signed-off-by: Yifan Hong <elsk@google.com>
63 lines
1.5 KiB
Bash
Executable File
63 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
# SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
# Create an autoksyms.h header file from the list of all module's needed symbols
|
|
# as recorded in *.usyms files and the user-provided symbol whitelist.
|
|
|
|
set -e
|
|
|
|
# Use "make V=1" to debug this script.
|
|
case "$KBUILD_VERBOSE" in
|
|
*1*)
|
|
set -x
|
|
;;
|
|
esac
|
|
|
|
read_modorder=
|
|
|
|
if [ "$1" = --modorder ]; then
|
|
shift
|
|
read_modorder=1
|
|
fi
|
|
|
|
output_file="$1"
|
|
|
|
needed_symbols=
|
|
|
|
# Special case for modversions (see modpost.c)
|
|
if grep -q "^CONFIG_MODVERSIONS=y$" include/config/auto.conf; then
|
|
needed_symbols="$needed_symbols module_layout"
|
|
fi
|
|
|
|
ksym_wl=$(sed -n 's/^CONFIG_UNUSED_KSYMS_WHITELIST=\(.*\)$/\1/p' include/config/auto.conf)
|
|
if [ -n "$ksym_wl" ]; then
|
|
[ "${ksym_wl}" != "${ksym_wl#/}" ] || [ -f "$ksym_wl" ] || ksym_wl="$abs_srctree/$ksym_wl"
|
|
if [ ! -f "$ksym_wl" ] || [ ! -r "$ksym_wl" ]; then
|
|
echo "ERROR: '$ksym_wl' whitelist file not found" >&2
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
# Generate a new ksym list file with symbols needed by the current
|
|
# set of modules.
|
|
cat > "$output_file" << EOT
|
|
/*
|
|
* Automatically generated file; DO NOT EDIT.
|
|
*/
|
|
|
|
EOT
|
|
|
|
{
|
|
[ -n "${read_modorder}" ] && sed 's/ko$/usyms/' modules.order | xargs cat
|
|
echo "$needed_symbols"
|
|
[ -n "$ksym_wl" ] && cat "$ksym_wl"
|
|
} | sed -e 's/ /\n/g' | sed -n -e '/^$/!p' |
|
|
# Remove the dot prefix for ppc64; symbol names with a dot (.) hold entry
|
|
# point addresses.
|
|
sed -e 's/^\.//' |
|
|
sort -u |
|
|
# Ignore __this_module. It's not an exported symbol, and will be resolved
|
|
# when the final .ko's are linked.
|
|
grep -v '^__this_module$' |
|
|
sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$output_file"
|