Browse Source

linux26: changed SDECFG_PKG_LINUX_CONFIG_STYLE's modules into allmodules and defconfig, defining how the initial .config is created

karasz/qt
Alejandro Mery 16 years ago
parent
commit
8f80c11085
  1. 14
      base/linux26/config-700.in
  2. 22
      base/linux26/linux-conf.in

14
base/linux26/config-700.in

@ -16,10 +16,16 @@
menu_begin MENU_PKG_LINUX 'Linux Kernel Options' menu_begin MENU_PKG_LINUX 'Linux Kernel Options'
choice SDECFG_PKG_LINUX_CONFIG_STYLE modules \ choice SDECFG_PKG_LINUX_CONFIG_STYLE allmodules \
none 'Do not perform any automatic kernel configuration' \ none 'Use only the custom settings' \
nomodules 'Perform normal kernel configuration without modules' \ allmodules 'Automatic, starting with all modules enabled' \
modules 'Perform normal kernel configuration including modules' defconfig 'Automatic, starting with defconfig from upstream' \
nomodules 'Using defconfig but disabling all modules at the end'
if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" = none ]; then
comment " WARNING: you need config/$config/linux.cfg"
comment " for this setting to work."
fi
if pkgcheck uml_utilities X ; then if pkgcheck uml_utilities X ; then
choice SDECFG_PKG_LINUX_UML_STYLE modules \ choice SDECFG_PKG_LINUX_UML_STYLE modules \

22
base/linux26/linux-conf.in

@ -88,14 +88,18 @@ auto_config() {
# get defconfig (.config.0) # get defconfig (.config.0)
# #
echo "Creating linux default config" echo "Creating linux default config"
case "$SDECFG_PKG_LINUX_CONFIG_STYLE" in
if [ -f arch/$lx_cpu/defconfig ]; then none)
cp arch/$lx_cpu/defconfig .config abort "auto_config: shouldn't reach this point."
cp .config{,.0} ;;
else defconfig|nomodules)
cp arch/$lx_arch/configs/${lx_subarch}_defconfig .config eval $MAKE $makeopt defconfig
cp .config{,.0} ;;
fi allmodules)
eval $MAKE $makeopt allmodconfig
;;
esac
cp .config{,.0}
# architecture specific configuration (will be merged) # architecture specific configuration (will be merged)
x=$( ls -1 $base/package/*/linux26/arch/config.$arch.sh 2> /dev/null | head -n 1) x=$( ls -1 $base/package/*/linux26/arch/config.$arch.sh 2> /dev/null | head -n 1)
if [ -f "$x" ]; then if [ -f "$x" ]; then
@ -183,7 +187,7 @@ auto_config() {
mv .config .config_nomods mv .config .config_nomods
# which .config to use? # which .config to use?
if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" = "modules" ] ; then if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" != "nomodules" ] ; then
cp .config{_modules,} cp .config{_modules,}
else else
cp .config{_nomods,} cp .config{_nomods,}

Loading…
Cancel
Save