From 8dbbf80bff7899a9082752081f783e0888dce8d2 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Mon, 25 Aug 2003 13:58:42 +0000
Subject: [PATCH] added support for targets to suply text/plain kernel config
 files (fixes the bug that users can not supply kernel configs for the desktop
 target)

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1179 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE |  3 ++
 package/base/linux24/lx_config.sh       | 15 ++++---
 target/server/config.in                 | 56 -------------------------
 3 files changed, 12 insertions(+), 62 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 89ebcf5ba..f46160e26 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -4,6 +4,9 @@
  - added a new font to the cheapskatefonts package
  - improved some .desc files
  - reworked the desktop package selection
+ - added support for targets to suply text/plain kernel config files
+   (fixes the bug that users can not supply kernel configs for the desktop
+   target)
 
 *) 2003-08-24 (2.0.0-rc1 - 2.0.0-rc2)
 
diff --git a/package/base/linux24/lx_config.sh b/package/base/linux24/lx_config.sh
index 7d8583576..63dce3e79 100644
--- a/package/base/linux24/lx_config.sh
+++ b/package/base/linux24/lx_config.sh
@@ -102,19 +102,21 @@ lx_config ()
 	yes '' | eval $MAKE no2modconfig > /dev/null ; cp .config .config.2
 
 	if [ -f $base/target/$target/kernel$treever.conf.sh ] ; then
-		conffiles="$base/target/$target/kernel$treever.conf.sh $conffiles"
+		confscripts="$base/target/$target/kernel$treever.conf.sh $confscripts"
 	elif [ -f $base/target/$target/kernel.conf.sh ] ; then
-		conffiles="$base/target/$target/kernel.conf.sh $conffiles"
+		confscripts="$base/target/$target/kernel.conf.sh $confscripts"
 	fi
 
-	for x in $conffiles ; do
+	for x in $confscripts ; do
 		echo "  running: $x"
 		sh $x .config
 	done
 	cp .config .config.3
 
-	# merge target config
-	if [ -f $base/config/$config/linux.cfg ] ; then
+	# merge various text/plain config files
+	for x in $base/config/$config/linux.cfg \
+	         $base/target/$target/kernel.conf ; do
+	   if [ -f $x ] ; then
 		echo "  merging: 'config/$config/linux.cfg'"
 		x="$(sed '/CONFIG_/ ! d; s,.*CONFIG_\([^ =]*\).*,\1,' \
 			$base/config/$config/linux.cfg | tr '\n' '|')"
@@ -122,7 +124,8 @@ lx_config ()
 		sed 's,\(CONFIG_.*\)=n,# \1 is not set,' \
 			$base/config/$config/linux.cfg >> .config.4
 		cp .config.4 .config
-	fi
+	   fi
+	done
 
 	# create a valid .config
 	yes '' | eval $MAKE oldconfig > /dev/null ; cp .config .config.5
diff --git a/target/server/config.in b/target/server/config.in
index d0620bb5e..0008d7d86 100644
--- a/target/server/config.in
+++ b/target/server/config.in
@@ -92,59 +92,3 @@ ROCKCFGSET_CREATE_DOCS=1
 ROCKCFGSET_DISABLE_NLS=0
 ROCKCFGSET_PKG_GCC3_STACKPRO='1'
 
-# Linux kernel preconfig
-ROCKCFGSET_PKG_LINUX_CUSTCONFIG=1
-cat << 'EOT' > config/$config/linux.cfg
-# the most common desktop system
-CONFIG_SMP=n
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
-
-CONFIG_MODVERSIONS=y
-
-# more recent boxes need ACPI ...
-CONFIG_ACPI=y
-CONFIG_ACPI_BUSMGR=y
-CONFIG_ACPI_SYS=y
-CONFIG_ACPI_CPU=y
-CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_AC=y
-CONFIG_ACPI_EC=y
-CONFIG_ACPI_CMBATT=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_APM=y
-
-# some embedded or server stuff
-CONFIG_MTD=n
-CONFIG_PHONE=n
-CONFIG_FUSION=n
-CONFIG_I2O=n
-CONFIG_HAMRADIO=n
-
-
-# make USB only system happy
-
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_KEYBDEV=y
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_TOUCHSCREEN=m
-CONFIG_INPUT_MISC=y
-
-# improtant USB support
-CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
-CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HIDDEV=y
-
-# the usefull magic rq
-CONFIG_DEBUG_KERNEL=y
-CONFIG_MAGIC_SYSRQ=y
-
-EOT
-