Browse Source

linux26: introduced 'humble' config style - defconfig but no greedy enabling of modules

user/karasz/test/ecn
Alejandro Mery 15 years ago committed by Alejandro Mery
parent
commit
183e23e565
  1. 4
      base/linux26/config-700.in
  2. 4
      base/linux26/linux-conf.in

4
base/linux26/config-700.in

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../linux26/config-700.in # Filename: package/.../linux26/config-700.in
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2010 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -20,6 +20,7 @@ menu_begin MENU_PKG_LINUX 'Linux Kernel Options'
none 'Use only the custom settings' \ none 'Use only the custom settings' \
allmodules 'Automatic, starting with all modules enabled' \ allmodules 'Automatic, starting with all modules enabled' \
defconfig 'Automatic, starting with defconfig from upstream' \ defconfig 'Automatic, starting with defconfig from upstream' \
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 if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" = none ]; then
@ -34,4 +35,3 @@ menu_begin MENU_PKG_LINUX 'Linux Kernel Options'
guest 'Build UML Guest kernel (Not implemented yet!)' guest 'Build UML Guest kernel (Not implemented yet!)'
fi fi
menu_end menu_end

4
base/linux26/linux-conf.in

@ -85,7 +85,7 @@ auto_config() {
none) none)
abort "auto_config: shouldn't reach this point." abort "auto_config: shouldn't reach this point."
;; ;;
defconfig|nomodules) defconfig|humble|nomodules)
eval $MAKE $makeopt defconfig eval $MAKE $makeopt defconfig
;; ;;
allmodules) allmodules)
@ -115,10 +115,12 @@ auto_config() {
fi fi
if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" != "humble" ]; then
# all modules needs to be first so modules can be disabled by i.e. # all modules needs to be first so modules can be disabled by i.e.
# the targets later # the targets later
echo "Enabling all modules ..." echo "Enabling all modules ..."
yes '' | eval $MAKE $makeopt no2modconfig > /dev/null ; cp .config{,.2} yes '' | eval $MAKE $makeopt no2modconfig > /dev/null ; cp .config{,.2}
fi
# for "safety" we will apply the config twice, so hidden options have time # for "safety" we will apply the config twice, so hidden options have time
# to appear # to appear

Loading…
Cancel
Save