Browse Source

linux26: introduced SDECFG_PKG_LINUX_CONFIG_FILE as replacement of the hardcoded $base/config/$config/linux.cfg

user/chris/test/early-mdev
Alejandro Mery 15 years ago
parent
commit
84dbc01071
  1. 7
      base/linux26/config-700.in
  2. 11
      base/linux26/linux-conf.in

7
base/linux26/config-700.in

@ -23,12 +23,11 @@ menu_begin MENU_PKG_LINUX 'Linux Kernel Options'
humble 'Automatic, using defconfig but not forcing modules' \ humble 'Automatic, using defconfig but not forcing modules' \
nomodules 'Using defconfig but disabling all modules at the end' nomodules 'Using defconfig but disabling all modules at the end'
if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" = none ]; then comment ' '
comment " WARNING: you need config/$config/linux.cfg" text 'Custom settings file' SDECFG_PKG_LINUX_CONFIG_FILE "config/$config/linux.cfg"
comment " for this setting to work."
fi
if pkgcheck uml_utilities X ; then if pkgcheck uml_utilities X ; then
comment ' '
choice SDECFG_PKG_LINUX_UML_STYLE modules \ choice SDECFG_PKG_LINUX_UML_STYLE modules \
none 'Do not perform any automatic UML related optimization' \ none 'Do not perform any automatic UML related optimization' \
skas3 'Build UML Host kernel with SKAS3 support' \ skas3 'Build UML Host kernel with SKAS3 support' \

11
base/linux26/linux-conf.in

@ -31,7 +31,8 @@ fi
lx_extraversion= lx_extraversion=
lx_kernelrelease= lx_kernelrelease=
lx_customconf="$base/config/$config/linux.cfg"
lx_customconf="${SDECFG_PKG_LINUX_CONFIG_FILE:-config/$config/linux.cfg}"
# $lx_confmerge list of config snaps gets merged to .config.3 on auto_config() # $lx_confmerge list of config snaps gets merged to .config.3 on auto_config()
# #
@ -287,8 +288,12 @@ lx_config() {
echo "Generic linux configuration ..." echo "Generic linux configuration ..."
hook_eval preconf hook_eval preconf
if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" = none ] ; then if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" = none ] ; then
echo "Using only ${lx_customconf#$base/}." echo_status "Using only ${lx_customconf}."
cp -vf $lx_customconf .config if expr "$lx_customconf" : '/*' > /dev/null; then
cp -vf "$lx_customconf" .config
else
cp -vf "$base/$lx_customconf" .config
fi
eval $MAKE $makeopt oldconfig eval $MAKE $makeopt oldconfig
else else
echo "Automatically creating default configuration ...." echo "Automatically creating default configuration ...."

Loading…
Cancel
Save