From 84aeaa86ce7ba6121c706713f8462751a2b3046f Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 16 Feb 2004 18:15:04 +0000
Subject: [PATCH] Clifford Wolf: fixed glibc*.conf and linux24/config-500.in
 for building a target with only a linux*-header package, but no
 /usr/src/linux/include directory

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2353 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/glibc22/glibc22.conf  | 2 +-
 package/base/glibc23/glibc23.conf  | 2 +-
 package/base/linux24/config-500.in | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/base/glibc22/glibc22.conf b/package/base/glibc22/glibc22.conf
index 9a34805e9..cd3fc49d6 100644
--- a/package/base/glibc22/glibc22.conf
+++ b/package/base/glibc22/glibc22.conf
@@ -36,7 +36,7 @@ glibc_custmain() {
 	# code so we can use this glibc to debug other programs.
 	CFLAGS="$CFLAGS -g -DNDEBUG=1" ./configure --with-gnu-binutils \
 		--enable-add-ons --enable-profile \
-		--with-headers=$root/usr/src/linux/include \
+		--with-headers=$root/usr/include/linux \
 		--with-gd=/usr \
 		--with-gd-lib=/usr/lib \
 		--with-gd-include=/usr/include \
diff --git a/package/base/glibc23/glibc23.conf b/package/base/glibc23/glibc23.conf
index 4572964a1..50245baa9 100644
--- a/package/base/glibc23/glibc23.conf
+++ b/package/base/glibc23/glibc23.conf
@@ -35,7 +35,7 @@ glibc_custmain() {
         # code so we can use this glibc to debug other programs.
         CFLAGS="$CFLAGS -g -DNDEBUG=1" ../configure --prefix=$root/usr \
                 --with-gnu-binutils --enable-add-ons $G_PROFILE \
-                --with-headers=$root/usr/src/linux/include --with-gd=/usr \
+                --with-headers=$root/usr/include/linux --with-gd=/usr \
                 --with-gd-lib=/usr/lib --with-gd-include=/usr/include \
                 --build=${arch_build} --host=${arch_target}
 
diff --git a/package/base/linux24/config-500.in b/package/base/linux24/config-500.in
index d9cc54720..68e543a70 100644
--- a/package/base/linux24/config-500.in
+++ b/package/base/linux24/config-500.in
@@ -27,13 +27,15 @@ menu_begin MENU_PKG_LINUX 'Linux Kernel Options'
                 list="$list $pkg Use_${pkg}_($ver)_as_standard_Kernel"
         done < <(grep "^X .* KERNEL " config/$config/packages | cut -f5,6 -d' ')
         if [ -z "$default" ] ; then
-                default="linux" ; list="linux No_Standard_Kernel"
+                default="none" ; list="none No_Standard_Kernel"
         fi
 
 	choice ROCKCFG_DEFAULT_KERNEL $default $list
 
-	pkgfilter sed  -e "/ linux.*-header / s/^./O/" \
-	               -e "/ $ROCKCFG_DEFAULT_KERNEL-header / s/^./X/"
+	if [ $ROCKCFG_DEFAULT_KERNEL != none ]; then
+		pkgfilter sed  -e "/ linux.*-header / s/^./O/" \
+			       -e "/ $ROCKCFG_DEFAULT_KERNEL-header / s/^./X/"
+	fi
 
 	if [ "$ROCKCFG_PKG_LINUX_CONFIG_STYLE" = none ] ; then
 		ROCKCFGSET_PKG_LINUX_CUSTCONFIG=1