Dimitar Zhekov <jimmy@is-vn.bg>:

lx_config.sh: fix typo: $$ROCKCFG_PKG_LINUX_CONFIG_STYLE

lx_config.sh: make an oldconfig when config style = none
to fillout any comments stripped from linux.cfg and add
any new comments/settings if the target kernel is newer
than the one used to create linux.cfg (make xconfig and
menuconfig seem to need the comments from some purpose).

linux24-src.conf: don't copy .config_{nomods,modules} if
config style = none (they don't exist in this case).


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1366 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -14,7 +14,9 @@
 		   xfree86-doc, added xfce4 session manager, fixed cd ; echo,
                    added new lilo config optionsm, added stone to the
                    2nd_stage_small incl. further space optimizations, cleanup
-                   of some stone modules and a shell gasgui implementation
+                   of some stone modules and a shell gasgui implementation,
+                   fixed the new linux configuration code for the none-style
+                   case
  - fixed linux24-src for treever non-numeric content (e.g. linux24benh-src)
 
 *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2)

package/base/linux24-src/linux24-src.conf

@@ -48,8 +48,10 @@ main_lx_src() {
 
 	lx_config
 
-	cp -v .config_nomods  ../linux$treever-patches/config_nomods.txt
-	cp -v .config_modules ../linux$treever-patches/config_modules.txt
+	if [ "$ROCKCFG_PKG_LINUX_CONFIG_STYLE" != none ] ; then
+		cp -v .config_nomods  ../linux$treever-patches/config_nomods.txt
+		cp -v .config_modules ../linux$treever-patches/config_modules.txt
+	fi
 
 	# can fail in stage 0-1 ...
 	if [ $stagelevel -gt 1 ] && [[ $treever = 24* ]] ; then

package/base/linux24/lx_config.sh

@@ -156,10 +156,12 @@ lx_config ()
 		touch include/linux/modversions.h
 	fi
 
-	if [ "$$ROCKCFG_PKG_LINUX_CONFIG_STYLE" = none ] ; then
+	if [ "$ROCKCFG_PKG_LINUX_CONFIG_STYLE" = none ] ; then
 		echo "Using \$base/config/\$config/linux.cfg."
-		echo "Since automatic generation is disabled ..." 
+		echo "Since automatic generation is disabled ..."
 		cp -v $base/config/$config/linux.cfg .config
+		# create a valid .config (new settings may be available)
+		yes '' | eval $MAKE oldconfig > /dev/null
 	else
 		echo "Automatically creating default configuration ...."
 		auto_config