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

base/linux26/config-700.in

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # 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) 1998 - 2003 Clifford Wolf
 #
@@ -20,6 +20,7 @@ menu_begin MENU_PKG_LINUX 'Linux Kernel Options'
 		none 'Use only the custom settings' \
 		allmodules 'Automatic, starting with all modules enabled' \
 		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'
 
 	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!)'
 	fi
 menu_end
-

base/linux26/linux-conf.in

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