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

merge_config.sh: Allow to define config prefix

with CONFIG_ environment variable.

merge_config.sh uses CONFIG_ which is used in kernel and other projects.
There are some projects which use kconfig with different prefixes (e.g.
buildroot: BR2_ prefix). CONFIG_ variable is already used for this
purpose in kconfig binary (scripts/kconfig/lkc.h), let's use the same
rule for in merge_config.sh.

Suggested-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

authored by

Petr Vorel and committed by
Masahiro Yamada
2cd3faf8 3f80babd

+5 -1
+5 -1
scripts/kconfig/merge_config.sh
··· 33 33 echo " -n use allnoconfig instead of alldefconfig" 34 34 echo " -r list redundant entries when merging fragments" 35 35 echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead." 36 + echo 37 + echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable." 36 38 } 37 39 38 40 RUNMAKE=true 39 41 ALLTARGET=alldefconfig 40 42 WARNREDUN=false 41 43 OUTPUT=. 44 + CONFIG_PREFIX=${CONFIG_-CONFIG_} 42 45 43 46 while true; do 44 47 case $1 in ··· 102 99 fi 103 100 104 101 MERGE_LIST=$* 105 - SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p" 102 + SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p" 103 + 106 104 TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) 107 105 108 106 echo "Using $INITFILE as base"