8f069a665c
This patch allows us to define config prefix with CONFIG_ environment
variable.
By setting the proper config prefix, we will have proper 'redundant
configuration warnings' when we use '-r -m' options.
This is actually already in mainline for v4.20-rc1:
2cd3faf87d2d8f6123adf34741b9a7b98828a76f
("merge_config.sh: Allow to define config prefix")
Signed-off-by: Nasser Afshin <afshin.nasser@gmail.com>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
32 lines
970 B
Diff
32 lines
970 B
Diff
Index: kconfig/merge_config.sh
|
|
===================================================================
|
|
--- kconfig.orig/merge_config.sh
|
|
+++ kconfig/merge_config.sh
|
|
@@ -34,12 +34,16 @@ usage() {
|
|
echo " -r list redundant entries when merging fragments"
|
|
echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead."
|
|
echo " -e colon-separated list of br2-external trees to use (optional)"
|
|
+ echo
|
|
+ echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_
|
|
+ environment variable."
|
|
}
|
|
|
|
RUNMAKE=true
|
|
ALLTARGET=alldefconfig
|
|
WARNREDUN=false
|
|
OUTPUT=.
|
|
+CONFIG_PREFIX=${CONFIG_-CONFIG_}
|
|
|
|
while true; do
|
|
case $1 in
|
|
@@ -105,7 +109,8 @@ if [ ! -r "$INITFILE" ]; then
|
|
fi
|
|
|
|
MERGE_LIST=$*
|
|
-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
|
|
+SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
|
|
+
|
|
TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
|
|
|
|
echo "Using $INITFILE as base"
|