still refining that new 2.4.6 linux ebuild; more improvements to come...

3 files changed, 649 insertions, 133 deletions

diff --git a/sys-kernel/linux-extras/linux-extras-2.4.6.ebuild b/sys-kernel/linux-extras/linux-extras-2.4.6.ebuild
index e129eb1733eb..b4fdd91e1a15 100644
--- a/sys-kernel/linux-extras/linux-extras-2.4.6.ebuild
+++ b/sys-kernel/linux-extras/linux-extras-2.4.6.ebuild
@@ -4,34 +4,39 @@
 # /home/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.4.3.ebuild,v 1.1 2001/05/02 14:31:06 achim Exp
 
 #OKV=original kernel version, KV=patched kernel version
+
 OKV=2.4.6
 KV=2.4.6
 S=${WORKDIR}/linux-${KV}
+S2=${WORKDIR}/linux-${KV}-extras
+if [ $PN = "linux-extras" ]
+then
+	KS=/usr/src/linux-${KV}
+	KS2=/usr/src/linux-${KV}-extras
+else
+	KS=${S}
+	KS2=${S2}
+fi
 
-# Versions of LVM
-LVMV=0.9.1_beta7
-
-LVMVARC=0.9.1_beta7
+# Kernel Features      Enabled   USE Variable      Status
+#
+# Reiserfs             Y         -                 Production-ready
+# JFS                  N         jfs               Testing-only (commented out for now)
+# LVM                  Y         lvm               Production-ready
+# ext3                 Y         ext3              Production-ready
+# MOSIX                Y         mosix             Testing only
+# XFS                  N         xfs               Will add soon
+# PCMCIA-CS            Y         pcmcia            Need to move this to its own ebuild
+# ALSA                 N         alsa              Need to move this to its own ebuild
+# lm-sensors           N         lm_sensors        Need to move this to its own ebuild
 
-# alsa is coming out of the kernel
-# Versions of alsa
+LVMV=0.9.1_beta7
+EXT3V=2.4-0.9.1-246
+MOSV=1.0.5
 # AV=0.5.11
-
-# Versionos of jfs
-JFSV=1.0.0
-
-# Versions of lm_sensors
-#SENV=2.6.0
-
-# Versions of reiserfs
-RV=20010327
-KNV="6.g"
-PIV="1.d"
-
-# Versions of xmlprocfs
-XMLV=0.3
-
-# Versions of pcmcia-cs
+#JFSV=1.0.0
+#KNV="6.g"
+#PIV="1.d"
 PCV="3.1.27"
 
 [ "${PN}" = "linux" ] && DESCRIPTION="Linux kernel version ${KV}, including modules, binary tools, libraries and includes"
@@ -43,13 +48,13 @@ PCV="3.1.27"
 if [ ! "${PN}" = "linux-extras" ] ; then
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	http://prdownloads.sourceforge.net/pcmcia-cs/pcmcia-cs-${PCV}.tar.gz
-	http://www.zip.com.au/~akpm/ext3-2.4-0.9.1-246.gz
+	http://www.zip.com.au/~akpm/ext3-${EXT3V}.gz
 	http://oss.software.ibm.com/developerworks/opensource/jfs/project/pub/jfs-1.0.0-patch.tar.gz
-	ftp://ftp.cs.huji.ac.il/users/mosix/MOSIX-1.0.5.tar.gz"
+	ftp://ftp.cs.huji.ac.il/users/mosix/MOSIX-${MOSV}.tar.gz"
+	ftp://ftp.sistina.com/pub/LVM/0.9.1_beta/lvm_${LVMV}.tar.gz
 fi
 #	http://www.netroedge.com/~lm78/archive/lm_sensors-${SENV}.tar.gz
 #	http://www.netroedge.com/~lm78/archive/i2c-${SENV}.tar.gz
-#	ftp://ftp.sistina.com/pub/LVM/0.9.1_beta/lvm_${LVMVARC}.tar.gz
 #	ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${AV}.tar.bz2
 	
 if [ "$PN" != "linux-extras" ]
@@ -109,20 +114,22 @@ src_unpack() {
 #			cat ${DISTDIR}/patch-2.4.6-xfs-${x}.bz2 | bzip2 -d | patch -p1
 #		done		
 		
-		mkdir ${S}/extras
+		dodir /usr/src/linux-${KV}-extras
 
 		if [ "`use mosix`" ]
 		then
 			echo "Applying MOSIX patch..."
-			cd ${S}/extras
-			mkdir MOSIX-1.0.5
-			cd MOSIX-1.0.5
-			unpack MOSIX-1.0.5.tar.gz
-			tar -x --no-same-owner -vf user.tar
-			rm user.tar
+			cd ${S2}
+			mkdir MOSIX-${MOSV}
+			cd MOSIX-${MOSV}
+			unpack MOSIX-${MOSV}.tar.gz
 			cd ${S}
-			try cat extras/MOSIX-1.0.5/patches.2.4.6 | patch -p0
-			tar -x --no-same-owner -vf extras/MOSIX-1.0.5/kernel.new.2.4.6.tar
+			try cat ${S2}/MOSIX-${MOSV}/patches.2.4.6 | patch -p0
+			tar -x --no-same-owner -vf ${S2}/MOSIX-${MOSV}/kernel.new.2.4.6.tar
+			cd ${S2}
+			mkdir user
+			tar -x --no-same-owner -vf user.tar -C user
+			rm user.tar
 		fi
 		
 		cd ${S}
@@ -132,9 +139,9 @@ src_unpack() {
 		if [ "`use lvm`" ]
 		then
 			#create and apply LVM patch.  The tools get built later.
-			cd ${S}/extras
+			cd ${S2}
 			echo "Unpacking and applying LVM patch..."
-			unpack lvm_${LVMVARC}.tar.gz
+			unpack lvm_${LVMV}.tar.gz
 			try cd LVM/${LVMV}
 	
 			# I had to hack this in so that LVM will look in the current linux
@@ -144,7 +151,7 @@ src_unpack() {
 			try make KERNEL_VERSION=${KV} KERNEL_DIR=${S}
 			cd ${S}
 			# the -l option allows this patch to apply cleanly (ignore whitespace changes)
-			try patch -l -p1 < ${S}/extras/LVM/${LVMV}/PATCHES/lvm-${LVMV}-${KV}.patch
+			try patch -l -p1 < ${S2}/LVM/${LVMV}/PATCHES/lvm-${LVMV}-${KV}.patch
 			cd ${S}/drivers/md
 			try patch -p0 < ${FILESDIR}/${KV}/lvm.c.diff
 		fi
@@ -192,7 +199,7 @@ src_unpack() {
 		if [ "`use pcmcia-cs`" ]
 		then
 			echo "Unpacking pcmcia-cs tools..."
-			cd ${S}/extras
+			cd ${S2}
 			unpack pcmcia-cs-${PCV}.tar.gz
 		#	patch -p0 < ${FILESDIR}/${KV}/pcmcia-cs-${PCV}-gentoo.diff
 		fi
@@ -218,7 +225,7 @@ src_unpack() {
 				echo
 			fi
 			cd ${S}
-			gzip -dc ${DISTDIR}/ext3-2.4-0.9.1-246.gz | patch -l -p1
+			gzip -dc ${DISTDIR}/ext3-${EXT3V}.gz | patch -l -p1
 			if [ "`use mosix`" ]
 			then
 				echo 
@@ -250,17 +257,10 @@ src_unpack() {
 	
 	fi
 }
-
+		
 src_compile() {
-
 	if [ "${PN}" != "linux-sources" ]
 	then
-		if [ $PN = "linux-extras" ]
-			then
-			KS=/usr/src/linux
-		else
-			KS=${S}
-		fi
 		if [ $PN = "linux" ]
 		then
 			try make symlinks
@@ -268,7 +268,7 @@ src_compile() {
 		if [ "`use lvm`" ]
 		then
 			#LVM tools are included in the linux and linux-extras pakcages
-			cd ${KS}/extras/LVM/${LVMV}
+			cd ${KS2}/LVM/${LVMV}
 	
 			# This is needed for linux-extras
 			if [ -f "Makefile" ]
@@ -323,7 +323,7 @@ src_compile() {
 		
 		if [ "`use mosix`" ]
 		then
-			cd ${KS}/extras/MOSIX-1.0.5
+			cd ${KS2}/MOSIX-${MOSV}
 			local x
 			for x in lib/moslib sbin/setpe sbin/tune bin/mosrun usr.bin/mon usr.bin/migrate usr.bin/mosctl
 			do
@@ -335,7 +335,7 @@ src_compile() {
 
 		if [ "`use pcmcia-cs`" ]
 		then
-			cd ${KS}/extras/pcmcia-cs-${PCV}
+			cd ${KS2}/pcmcia-cs-${PCV}
 			# This is needed for linux-extras
 			if [ -f "Makefile" ] 
 			then
@@ -352,12 +352,6 @@ src_compile() {
 }
 
 src_install() {
-
-    if [ $PN = "linux-extras" ] ; then
-        KS=/usr/src/linux
-    else
-        KS=${S}
-    fi
     # We install the alsa headers in all three packages
 #   if [ "`use alsa`" ]
 #	then
@@ -370,17 +364,11 @@ src_install() {
 
 	if [ ! "${PN}" = "linux-sources" ]
     then
-		if [ $PN = "linux" ]
-		then
-			KS=${S}
-		else
-			KS=/usr/src/linux
-		fi
 		dodir /usr/lib
 	
 		if [ "`use mosix`" ]
 		then
-			cd ${KS}/extras/MOSIX-1.0.5/lib/moslib
+			cd ${KS2}/MOSIX-${MOSV}
 			dodir /usr/lib /usr/include
 			dolib.a libmos.a
 			dolib.so libmos.so.0
@@ -393,10 +381,9 @@ src_install() {
 			into /
 			dosbin setpe
 
-#			Tune is missing a file so compilation aborts
-#			cd ../tune
-#			dosbin tune mtune tunepass tune_kernel prep_tune
-#			doman tune.1
+			cd ../tune
+			dosbin tune mtune tunepass tune_kernel prep_tune
+			doman tune.1
 
 			cd ../../bin/mosrun
 			dobin mosrun nomig runhome runon cpujob iojob nodecay slowdecay fastdecay
@@ -422,11 +409,19 @@ src_install() {
 
 			exeinto /etc/rc.d/init.d
 			newexe ${FILESDIR}/${KV}/mosix.init mosix
+		
+			cd ${KS2}/MOSIX-${MOSV}
+			for x in lib/moslib sbin/setpe sbin/tune bin/mosrun usr.bin/mon usr.bin/migrate usr.bin/mosctl
+			do
+				cd ${x}
+				make clean
+				cd ../..
+			done
 		fi
 		
 		if [ "`use lvm`" ]
 		then
-			cd ${KS}/extras/LVM/${LVMV}/tools
+			cd ${KS2}/LVM/${LVMV}/tools
 	    
 			try CFLAGS=\""${CFLAGS} -I${KS}/include"\" make install -e prefix=${D} mandir=${D}/usr/share/man \
 			sbindir=${D}/sbin libdir=${D}/lib
@@ -484,7 +479,7 @@ src_install() {
 		if [ "`use pcmcia-cs`" ]
 		then
 			#install PCMCIA modules and utilities
-			cd ${KS}/extras/pcmcia-cs-${PCV}
+			cd ${KS2}/pcmcia-cs-${PCV}
 			try make PREFIX=${D} MANDIR=${D}/usr/share/man install  
 			rm -rf ${D}/etc/rc.d
 			exeinto /etc/rc.d/init.d
diff --git a/sys-kernel/linux-sources/linux-sources-2.4.6.ebuild b/sys-kernel/linux-sources/linux-sources-2.4.6.ebuild
index cd472dcc8a2b..b4fdd91e1a15 100644
--- a/sys-kernel/linux-sources/linux-sources-2.4.6.ebuild
+++ b/sys-kernel/linux-sources/linux-sources-2.4.6.ebuild
@@ -4,34 +4,39 @@
 # /home/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.4.3.ebuild,v 1.1 2001/05/02 14:31:06 achim Exp
 
 #OKV=original kernel version, KV=patched kernel version
+
 OKV=2.4.6
 KV=2.4.6
 S=${WORKDIR}/linux-${KV}
+S2=${WORKDIR}/linux-${KV}-extras
+if [ $PN = "linux-extras" ]
+then
+	KS=/usr/src/linux-${KV}
+	KS2=/usr/src/linux-${KV}-extras
+else
+	KS=${S}
+	KS2=${S2}
+fi
 
-# Versions of LVM
-LVMV=0.9.1_beta7
-
-LVMVARC=0.9.1_beta7
+# Kernel Features      Enabled   USE Variable      Status
+#
+# Reiserfs             Y         -                 Production-ready
+# JFS                  N         jfs               Testing-only (commented out for now)
+# LVM                  Y         lvm               Production-ready
+# ext3                 Y         ext3              Production-ready
+# MOSIX                Y         mosix             Testing only
+# XFS                  N         xfs               Will add soon
+# PCMCIA-CS            Y         pcmcia            Need to move this to its own ebuild
+# ALSA                 N         alsa              Need to move this to its own ebuild
+# lm-sensors           N         lm_sensors        Need to move this to its own ebuild
 
-# alsa is coming out of the kernel
-# Versions of alsa
+LVMV=0.9.1_beta7
+EXT3V=2.4-0.9.1-246
+MOSV=1.0.5
 # AV=0.5.11
-
-# Versionos of jfs
-JFSV=1.0.0
-
-# Versions of lm_sensors
-#SENV=2.6.0
-
-# Versions of reiserfs
-RV=20010327
-KNV="6.g"
-PIV="1.d"
-
-# Versions of xmlprocfs
-XMLV=0.3
-
-# Versions of pcmcia-cs
+#JFSV=1.0.0
+#KNV="6.g"
+#PIV="1.d"
 PCV="3.1.27"
 
 [ "${PN}" = "linux" ] && DESCRIPTION="Linux kernel version ${KV}, including modules, binary tools, libraries and includes"
@@ -43,13 +48,13 @@ PCV="3.1.27"
 if [ ! "${PN}" = "linux-extras" ] ; then
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	http://prdownloads.sourceforge.net/pcmcia-cs/pcmcia-cs-${PCV}.tar.gz
-	http://www.zip.com.au/~akpm/ext3-2.4-0.9.1-246.gz
+	http://www.zip.com.au/~akpm/ext3-${EXT3V}.gz
 	http://oss.software.ibm.com/developerworks/opensource/jfs/project/pub/jfs-1.0.0-patch.tar.gz
-	ftp://ftp.cs.huji.ac.il/users/mosix/MOSIX-1.0.5.tar.gz"
+	ftp://ftp.cs.huji.ac.il/users/mosix/MOSIX-${MOSV}.tar.gz"
+	ftp://ftp.sistina.com/pub/LVM/0.9.1_beta/lvm_${LVMV}.tar.gz
 fi
 #	http://www.netroedge.com/~lm78/archive/lm_sensors-${SENV}.tar.gz
 #	http://www.netroedge.com/~lm78/archive/i2c-${SENV}.tar.gz
-#	ftp://ftp.sistina.com/pub/LVM/0.9.1_beta/lvm_${LVMVARC}.tar.gz
 #	ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${AV}.tar.bz2
 	
 if [ "$PN" != "linux-extras" ]
@@ -109,18 +114,22 @@ src_unpack() {
 #			cat ${DISTDIR}/patch-2.4.6-xfs-${x}.bz2 | bzip2 -d | patch -p1
 #		done		
 		
-		mkdir ${S}/extras
+		dodir /usr/src/linux-${KV}-extras
 
 		if [ "`use mosix`" ]
 		then
 			echo "Applying MOSIX patch..."
-			cd ${S}/extras
-			mkdir MOSIX-1.0.5
-			cd MOSIX-1.0.5
-			unpack MOSIX-1.0.5.tar.gz
+			cd ${S2}
+			mkdir MOSIX-${MOSV}
+			cd MOSIX-${MOSV}
+			unpack MOSIX-${MOSV}.tar.gz
 			cd ${S}
-			try cat extras/MOSIX-1.0.5/patches.2.4.6 | patch -p0
-			tar -x --no-same-owner -vf extras/MOSIX-1.0.5/kernel.new.2.4.6.tar
+			try cat ${S2}/MOSIX-${MOSV}/patches.2.4.6 | patch -p0
+			tar -x --no-same-owner -vf ${S2}/MOSIX-${MOSV}/kernel.new.2.4.6.tar
+			cd ${S2}
+			mkdir user
+			tar -x --no-same-owner -vf user.tar -C user
+			rm user.tar
 		fi
 		
 		cd ${S}
@@ -130,9 +139,9 @@ src_unpack() {
 		if [ "`use lvm`" ]
 		then
 			#create and apply LVM patch.  The tools get built later.
-			cd ${S}/extras
+			cd ${S2}
 			echo "Unpacking and applying LVM patch..."
-			unpack lvm_${LVMVARC}.tar.gz
+			unpack lvm_${LVMV}.tar.gz
 			try cd LVM/${LVMV}
 	
 			# I had to hack this in so that LVM will look in the current linux
@@ -142,7 +151,7 @@ src_unpack() {
 			try make KERNEL_VERSION=${KV} KERNEL_DIR=${S}
 			cd ${S}
 			# the -l option allows this patch to apply cleanly (ignore whitespace changes)
-			try patch -l -p1 < ${S}/extras/LVM/${LVMV}/PATCHES/lvm-${LVMV}-${KV}.patch
+			try patch -l -p1 < ${S2}/LVM/${LVMV}/PATCHES/lvm-${LVMV}-${KV}.patch
 			cd ${S}/drivers/md
 			try patch -p0 < ${FILESDIR}/${KV}/lvm.c.diff
 		fi
@@ -190,7 +199,7 @@ src_unpack() {
 		if [ "`use pcmcia-cs`" ]
 		then
 			echo "Unpacking pcmcia-cs tools..."
-			cd ${S}/extras
+			cd ${S2}
 			unpack pcmcia-cs-${PCV}.tar.gz
 		#	patch -p0 < ${FILESDIR}/${KV}/pcmcia-cs-${PCV}-gentoo.diff
 		fi
@@ -216,7 +225,7 @@ src_unpack() {
 				echo
 			fi
 			cd ${S}
-			gzip -dc ${DISTDIR}/ext3-2.4-0.9.1-246.gz | patch -l -p1
+			gzip -dc ${DISTDIR}/ext3-${EXT3V}.gz | patch -l -p1
 			if [ "`use mosix`" ]
 			then
 				echo 
@@ -248,17 +257,10 @@ src_unpack() {
 	
 	fi
 }
-
+		
 src_compile() {
-
 	if [ "${PN}" != "linux-sources" ]
 	then
-		if [ $PN = "linux-extras" ]
-			then
-			KS=/usr/src/linux
-		else
-			KS=${S}
-		fi
 		if [ $PN = "linux" ]
 		then
 			try make symlinks
@@ -266,7 +268,7 @@ src_compile() {
 		if [ "`use lvm`" ]
 		then
 			#LVM tools are included in the linux and linux-extras pakcages
-			cd ${KS}/extras/LVM/${LVMV}
+			cd ${KS2}/LVM/${LVMV}
 	
 			# This is needed for linux-extras
 			if [ -f "Makefile" ]
@@ -321,8 +323,7 @@ src_compile() {
 		
 		if [ "`use mosix`" ]
 		then
-			cd ${KS}/extras/MOSIX-1.0.5
-			tar -x --no-same-owner -vf user.tar -C ${T}
+			cd ${KS2}/MOSIX-${MOSV}
 			local x
 			for x in lib/moslib sbin/setpe sbin/tune bin/mosrun usr.bin/mon usr.bin/migrate usr.bin/mosctl
 			do
@@ -334,7 +335,7 @@ src_compile() {
 
 		if [ "`use pcmcia-cs`" ]
 		then
-			cd ${KS}/extras/pcmcia-cs-${PCV}
+			cd ${KS2}/pcmcia-cs-${PCV}
 			# This is needed for linux-extras
 			if [ -f "Makefile" ] 
 			then
@@ -351,12 +352,6 @@ src_compile() {
 }
 
 src_install() {
-
-    if [ $PN = "linux-extras" ] ; then
-        KS=/usr/src/linux
-    else
-        KS=${S}
-    fi
     # We install the alsa headers in all three packages
 #   if [ "`use alsa`" ]
 #	then
@@ -369,17 +364,11 @@ src_install() {
 
 	if [ ! "${PN}" = "linux-sources" ]
     then
-		if [ $PN = "linux" ]
-		then
-			KS=${S}
-		else
-			KS=/usr/src/linux
-		fi
 		dodir /usr/lib
 	
 		if [ "`use mosix`" ]
 		then
-			cd ${T}
+			cd ${KS2}/MOSIX-${MOSV}
 			dodir /usr/lib /usr/include
 			dolib.a libmos.a
 			dolib.so libmos.so.0
@@ -420,11 +409,19 @@ src_install() {
 
 			exeinto /etc/rc.d/init.d
 			newexe ${FILESDIR}/${KV}/mosix.init mosix
+		
+			cd ${KS2}/MOSIX-${MOSV}
+			for x in lib/moslib sbin/setpe sbin/tune bin/mosrun usr.bin/mon usr.bin/migrate usr.bin/mosctl
+			do
+				cd ${x}
+				make clean
+				cd ../..
+			done
 		fi
 		
 		if [ "`use lvm`" ]
 		then
-			cd ${KS}/extras/LVM/${LVMV}/tools
+			cd ${KS2}/LVM/${LVMV}/tools
 	    
 			try CFLAGS=\""${CFLAGS} -I${KS}/include"\" make install -e prefix=${D} mandir=${D}/usr/share/man \
 			sbindir=${D}/sbin libdir=${D}/lib
@@ -482,7 +479,7 @@ src_install() {
 		if [ "`use pcmcia-cs`" ]
 		then
 			#install PCMCIA modules and utilities
-			cd ${KS}/extras/pcmcia-cs-${PCV}
+			cd ${KS2}/pcmcia-cs-${PCV}
 			try make PREFIX=${D} MANDIR=${D}/usr/share/man install  
 			rm -rf ${D}/etc/rc.d
 			exeinto /etc/rc.d/init.d
diff --git a/sys-kernel/linux/linux-2.4.6.ebuild b/sys-kernel/linux/linux-2.4.6.ebuild
new file mode 100644
index 000000000000..b4fdd91e1a15
--- /dev/null
+++ b/sys-kernel/linux/linux-2.4.6.ebuild
@@ -0,0 +1,524 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Daniel Robbins <drobbins@gentoo.org>
+# /home/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.4.3.ebuild,v 1.1 2001/05/02 14:31:06 achim Exp
+
+#OKV=original kernel version, KV=patched kernel version
+
+OKV=2.4.6
+KV=2.4.6
+S=${WORKDIR}/linux-${KV}
+S2=${WORKDIR}/linux-${KV}-extras
+if [ $PN = "linux-extras" ]
+then
+	KS=/usr/src/linux-${KV}
+	KS2=/usr/src/linux-${KV}-extras
+else
+	KS=${S}
+	KS2=${S2}
+fi
+
+# Kernel Features      Enabled   USE Variable      Status
+#
+# Reiserfs             Y         -                 Production-ready
+# JFS                  N         jfs               Testing-only (commented out for now)
+# LVM                  Y         lvm               Production-ready
+# ext3                 Y         ext3              Production-ready
+# MOSIX                Y         mosix             Testing only
+# XFS                  N         xfs               Will add soon
+# PCMCIA-CS            Y         pcmcia            Need to move this to its own ebuild
+# ALSA                 N         alsa              Need to move this to its own ebuild
+# lm-sensors           N         lm_sensors        Need to move this to its own ebuild
+
+LVMV=0.9.1_beta7
+EXT3V=2.4-0.9.1-246
+MOSV=1.0.5
+# AV=0.5.11
+#JFSV=1.0.0
+#KNV="6.g"
+#PIV="1.d"
+PCV="3.1.27"
+
+[ "${PN}" = "linux" ] && DESCRIPTION="Linux kernel version ${KV}, including modules, binary tools, libraries and includes"
+[ "${PN}" = "linux-sources" ] && DESCRIPTION="Linux kernel version ${KV} - full sources"
+[ "${PN}" = "linux-extras" ] && DESCRIPTION="Linux kernel support tools and libraries"
+
+# We use build in /usr/src/linux in case of linux-extras
+# so we need no sources
+if [ ! "${PN}" = "linux-extras" ] ; then
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	http://prdownloads.sourceforge.net/pcmcia-cs/pcmcia-cs-${PCV}.tar.gz
+	http://www.zip.com.au/~akpm/ext3-${EXT3V}.gz
+	http://oss.software.ibm.com/developerworks/opensource/jfs/project/pub/jfs-1.0.0-patch.tar.gz
+	ftp://ftp.cs.huji.ac.il/users/mosix/MOSIX-${MOSV}.tar.gz"
+	ftp://ftp.sistina.com/pub/LVM/0.9.1_beta/lvm_${LVMV}.tar.gz
+fi
+#	http://www.netroedge.com/~lm78/archive/lm_sensors-${SENV}.tar.gz
+#	http://www.netroedge.com/~lm78/archive/i2c-${SENV}.tar.gz
+#	ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${AV}.tar.bz2
+	
+if [ "$PN" != "linux-extras" ]
+then
+	PROVIDE="virtual/kernel"
+fi
+#if [ "$PN" != "linux-sources" ]
+#then
+#	if [ "`use alsa`" ]
+#	then
+#		PROVIDE="$PROVIDE virtual/alsa"
+#	fi
+#fi
+
+HOMEPAGE="http://www.kernel.org/
+	  http://www.netroedge.com/~lm78/
+	  http://www.namesys.com
+	  http://www.sistina.com/lvm/
+	  http://pcmcia-cs.sourceforge.net"
+
+
+#these deps are messed up; fix 'em and add ncurses (required my mosix compile, menuconfig)
+if [ $PN != "linux-extras" ] ; then
+    RDEPEND=">=sys-apps/e2fsprogs-1.22 >=sys-apps/util-linux-2.11f >=sys-apps/reiserfs-utils-3.6.25-r1"
+    DEPEND=">=sys-apps/modutils-2.4.2 sys-devel/perl"
+else
+    DEPEND=">=sys-kernel/${PF/extras/sources}"
+fi
+if [ "`use build`" ] && [ $PN = "linux-sources" ] ; then
+    DEPEND=""
+    RDEPEND=""
+fi
+
+# this is not pretty...
+LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
+
+src_unpack() {
+
+    # We only need to unpack for linux and linux-sources
+
+    if [ ! "$PN" = "linux-extras" ]
+	then
+
+		#unpack kernel and apply reiserfs-related patches
+		cd ${WORKDIR}
+		unpack linux-${OKV}.tar.bz2
+		try mv linux linux-${KV}
+		cd ${S}
+#		echo "Applying ${KV} patch..."
+#		try bzip2 -dc ${DISTDIR}/patch-${KV}.bz2 | patch -p1
+		
+#		This patch is just *too* unweildy and creates tons of rejects all over the place (boo!)
+#		echo "Applying XFS patch..."
+#		local x
+#		for x in easy only tricky acl-extattr misc
+#		do
+#			cat ${DISTDIR}/patch-2.4.6-xfs-${x}.bz2 | bzip2 -d | patch -p1
+#		done		
+		
+		dodir /usr/src/linux-${KV}-extras
+
+		if [ "`use mosix`" ]
+		then
+			echo "Applying MOSIX patch..."
+			cd ${S2}
+			mkdir MOSIX-${MOSV}
+			cd MOSIX-${MOSV}
+			unpack MOSIX-${MOSV}.tar.gz
+			cd ${S}
+			try cat ${S2}/MOSIX-${MOSV}/patches.2.4.6 | patch -p0
+			tar -x --no-same-owner -vf ${S2}/MOSIX-${MOSV}/kernel.new.2.4.6.tar
+			cd ${S2}
+			mkdir user
+			tar -x --no-same-owner -vf user.tar -C user
+			rm user.tar
+		fi
+		
+		cd ${S}
+		echo "Applying reiserfs-NFS fix..."
+		try cat ${FILESDIR}/2.4.6/linux-2.4.6-reiserfs-NFS.patch | patch -N -p1
+				
+		if [ "`use lvm`" ]
+		then
+			#create and apply LVM patch.  The tools get built later.
+			cd ${S2}
+			echo "Unpacking and applying LVM patch..."
+			unpack lvm_${LVMV}.tar.gz
+			try cd LVM/${LVMV}
+	
+			# I had to hack this in so that LVM will look in the current linux
+			# source directory instead of /usr/src/linux for stuff - pete
+			try CFLAGS=\""${CFLAGS} -I${S}/include"\" ./configure --prefix=/ --mandir=/usr/share/man --with-kernel_dir="${S}"
+			cd PATCHES
+			try make KERNEL_VERSION=${KV} KERNEL_DIR=${S}
+			cd ${S}
+			# the -l option allows this patch to apply cleanly (ignore whitespace changes)
+			try patch -l -p1 < ${S2}/LVM/${LVMV}/PATCHES/lvm-${LVMV}-${KV}.patch
+			cd ${S}/drivers/md
+			try patch -p0 < ${FILESDIR}/${KV}/lvm.c.diff
+		fi
+    
+#		if [ "`use alsa`" ]
+#		then  
+#			#unpack alsa drivers
+#			echo "Unpacking ALSA drivers..."
+#			cd ${S}/extras
+#			unpack alsa-driver-${AV}.tar.bz2
+#		fi
+    
+#		if [ "`use lm_sensors`" ]
+#		then
+#			#unpack and apply the lm_sensors patch
+#			echo "Unpacking and applying lm_sensors patch..."
+#			cd ${S}/extras
+#			unpack lm_sensors-${SENV}.tar.gz
+#			unpack i2c-${SENV}.tar.gz
+#			try cd i2c-${SENV}
+#			try rmdir src
+#			try ln -s ../.. src
+#			try mkpatch/mkpatch.pl . /usr/src/linux | patch -p1 -E -d /usr/src/linux
+#			cp Makefile Makefile.orig
+#			try sed -e \"s:^LINUX=.*:LINUX=src:\" \
+#			-e \"s/^COMPILE_KERNEL.*/COMPILE_KERNEL := 2/\" \
+#			-e \"s:^I2C_HEADERS.*:I2C_HEADERS=.i2c-src/kernel:\" \
+#			-e \"s#^DESTDIR.*#DESTDIR := ${D}#\" \
+#			-e \"s#^PREFIX.*#PREFIX := /usr#\" \
+#			-e \"s#^MANDIR.*#MANDIR := /usr/share/man#\" \
+#			Makefile.orig > Makefile
+#			try cd ${S}/extras/lm_sensors-${SENV}
+#			try rmdir src
+#			try ln -s ../.. src
+#			try ln -s ../i2c-${SENV} i2c-src
+#			try mkpatch/mkpatch.pl . /usr/src/linux | patch -p1 -E -d /usr/src/linux
+#			try sed -e \"s:^LINUX=.*:LINUX=src:\" \
+#			-e \"s/^COMPILE_KERNEL.*/COMPILE_KERNEL := 2/\" \
+#			-e \"s:^I2C_HEADERS.*:I2C_HEADERS=.i2c-src/kernel:\" \
+#			-e \"s#^DESTDIR.*#DESTDIR := ${D}#\" \
+#			-e \"s#^PREFIX.*#PREFIX := /usr#\" \
+#			-e \"s#^MANDIR.*#MANDIR := /usr/share/man#\" \
+#			Makefile.orig > Makefile
+#		 fi
+		if [ "`use pcmcia-cs`" ]
+		then
+			echo "Unpacking pcmcia-cs tools..."
+			cd ${S2}
+			unpack pcmcia-cs-${PCV}.tar.gz
+		#	patch -p0 < ${FILESDIR}/${KV}/pcmcia-cs-${PCV}-gentoo.diff
+		fi
+		
+		#JFS patch works; commented out because it's not ready for production use
+		#if [ "`use jfs`" ]
+		#then
+		#	echo "Applying JFS patch..."
+		#	cd ${WORKDIR}
+		#	unpack jfs-${JFSV}-patch.tar.gz
+		#	cd ${S}
+		#	patch -p1 < ${WORKDIR}/jfs-common-v1.0.0-patch
+		#	patch -p1 < ${WORKDIR}/jfs-2.4.5-v1.0.0-patch
+		#fi
+		
+		if [ "`use ext3`" ]
+		then
+			echo "Applying ext3 patch..."
+			if [ "`use mosix`" ]
+			then
+				echo
+				echo "There will be one reject; we will fix it. (no worries)"
+				echo
+			fi
+			cd ${S}
+			gzip -dc ${DISTDIR}/ext3-${EXT3V}.gz | patch -l -p1
+			if [ "`use mosix`" ]
+			then
+				echo 
+				echo "Fixing reject in include/linux/sched.h..."
+				echo
+				cp ${FILESDIR}/${KV}/sched.h include/linux
+			fi
+		fi
+			
+		#get sources ready for compilation or for sitting at /usr/src/linux
+		echo "Preparing for compilation..."
+		cd ${S}
+		#sometimes we have icky kernel symbols; this seems to get rid of them
+		try make mrproper
+
+		#linux-sources needs to be fully configured, too.  Not just linux
+		if [ "${PN}" != "linux-extras" ]
+		then
+			#this is the configuration for the default kernel
+			try cp ${FILESDIR}/${KV}/config.bootcd .config
+			try yes \"\" \| make oldconfig
+			echo "Ignore any errors from the yes command above."
+		fi
+    
+		#fix silly permissions in tarball
+		cd ${WORKDIR}
+		chown -R 0.0 ${S}
+		chmod -R a+r-w+X,u+w ${S}
+	
+	fi
+}
+		
+src_compile() {
+	if [ "${PN}" != "linux-sources" ]
+	then
+		if [ $PN = "linux" ]
+		then
+			try make symlinks
+		fi
+		if [ "`use lvm`" ]
+		then
+			#LVM tools are included in the linux and linux-extras pakcages
+			cd ${KS2}/LVM/${LVMV}
+	
+			# This is needed for linux-extras
+			if [ -f "Makefile" ]
+			then
+				try make clean
+			fi
+			# I had to hack this in so that LVM will look in the current linux
+			# source directory instead of /usr/src/linux for stuff - pete
+			try CFLAGS=\""${CFLAGS} -I${KS}/include"\" ./configure --prefix=/ --mandir=/usr/share/man --with-kernel_dir="${KS}"
+			try make 
+		fi
+	
+#		if [ "`use lm_sensors`" ]
+#		then
+#			cd ${KS}/extras/lm_sensors-${SENV}
+#			try make
+#		fi
+		
+#		Works, just commented out because JFS isn't ready to be used by non-developers
+#		if [ "`use jfs`" ]
+#		then
+#			cd ${S}/fs/jfs/utils
+#			try make
+#			cd output
+#			into /
+#			dosbin *
+#			doman `find -iname *.8`
+#		fi
+			
+		if [ "$PN" == "linux" ]
+		then
+			try make HOSTCFLAGS=\""${LINUX_HOSTCFLAGS}"\" dep
+			try make HOSTCFLAGS=\""${LINUX_HOSTCFLAGS}"\" bzImage
+			#LEX=\""flex -l"\" bzImage
+			try make HOSTCFLAGS=\""${LINUX_HOSTCFLAGS}"\" modules
+			#LEX=\""flex -l"\" modules
+		fi
+		
+#This is moving into its own package RSN
+# This must come after the kernel compilation in linux
+#		if [ "`use alsa`" ]
+#		then
+#			cd ${KS}/extras/alsa-driver-${AV}
+#			# This is needed for linux-extras
+#			if [ -f "Makefile.conf" ] 
+#			then
+#				try make clean
+#			fi
+#			try ./configure --with-kernel=\"${KS}\" --with-isapnp=yes --with-sequencer=yes --with-oss=yes --with-cards=all
+#			try make
+#		fi
+		
+		if [ "`use mosix`" ]
+		then
+			cd ${KS2}/MOSIX-${MOSV}
+			local x
+			for x in lib/moslib sbin/setpe sbin/tune bin/mosrun usr.bin/mon usr.bin/migrate usr.bin/mosctl
+			do
+				cd $x
+				make
+				cd ../..
+			done
+		fi
+
+		if [ "`use pcmcia-cs`" ]
+		then
+			cd ${KS2}/pcmcia-cs-${PCV}
+			# This is needed for linux-extras
+			if [ -f "Makefile" ] 
+			then
+				try make clean
+			fi
+			try ./Configure -n --kernel=${KS} --moddir=/lib/modules/${KV} \
+			--notrust --cardbus --nopnp --noapm --srctree --sysv --rcdir=/etc/rc.d/
+			try make all
+		fi
+	else
+		#linux-sources
+		try make HOSTCFLAGS=\""${LINUX_HOSTCFLAGS}"\" dep
+	fi
+}
+
+src_install() {
+    # We install the alsa headers in all three packages
+#   if [ "`use alsa`" ]
+#	then
+#		#i get alsa includes
+#		cd ${KS}/extras/alsa-driver-${AV}
+#		insinto /usr/src/linux-${KV}/include/linux
+#		cd include
+#		doins asound.h asoundid.h asequencer.h ainstr_*.h
+#   fi
+
+	if [ ! "${PN}" = "linux-sources" ]
+    then
+		dodir /usr/lib
+	
+		if [ "`use mosix`" ]
+		then
+			cd ${KS2}/MOSIX-${MOSV}
+			dodir /usr/lib /usr/include
+			dolib.a libmos.a
+			dolib.so libmos.so.0
+			ln -s libmos.so.0 ${D}/usr/lib/libmos.so
+			insinto /usr/include
+			doins *.h
+
+			cd ../../sbin/setpe
+			doman setpe.1
+			into /
+			dosbin setpe
+
+			cd ../tune
+			dosbin tune mtune tunepass tune_kernel prep_tune
+			doman tune.1
+
+			cd ../../bin/mosrun
+			dobin mosrun nomig runhome runon cpujob iojob nodecay slowdecay fastdecay
+			doman mosrun.1
+			local x
+			for x in nomig runhome runon cpujob iojob nodecay slowdecay fastdecay
+			do
+				ln -s mosrun.1.gz ${D}/usr/share/man/man1/${x}.1.gz
+			done
+
+			cd ../../usr.bin/mon
+			into /usr
+			dobin mon
+			doman mon.1
+
+			cd ../migrate
+			dobin migrate
+			doman migrate.1
+
+			cd ../mosctl
+			dobin mosctl
+			doman mosctl.1
+
+			exeinto /etc/rc.d/init.d
+			newexe ${FILESDIR}/${KV}/mosix.init mosix
+		
+			cd ${KS2}/MOSIX-${MOSV}
+			for x in lib/moslib sbin/setpe sbin/tune bin/mosrun usr.bin/mon usr.bin/migrate usr.bin/mosctl
+			do
+				cd ${x}
+				make clean
+				cd ../..
+			done
+		fi
+		
+		if [ "`use lvm`" ]
+		then
+			cd ${KS2}/LVM/${LVMV}/tools
+	    
+			try CFLAGS=\""${CFLAGS} -I${KS}/include"\" make install -e prefix=${D} mandir=${D}/usr/share/man \
+			sbindir=${D}/sbin libdir=${D}/lib
+			#no need for a static library in /lib
+			mv ${D}/lib/*.a ${D}/usr/lib
+		fi
+	
+#		if [ "`use lm_sensors`" ]
+#		then
+#			echo "Install sensor tools..."
+#			#install sensors tools
+#			cd ${KS}/extras/lm_sensors-${SENV}
+#			make install
+#		fi
+
+		if [ "${PN}" = "linux" ] 
+		then
+			dodir /usr/src
+			dodir /usr/src/linux-${KV}
+			cd ${D}/usr/src
+			#grab includes and documentation only
+			echo ">>> Copying includes and documentation..."
+			cp -ax ${S}/include ${D}/usr/src/linux-${KV}
+			cp -ax ${S}/Documentation ${D}/usr/src/linux-${KV}
+	       
+			#grab compiled kernel
+			dodir /boot/boot
+			insinto /boot/boot
+			cd ${S}
+			doins arch/i386/boot/bzImage
+	    
+			#grab modules
+			# Do we have a bug in modutils ?
+			# Meanwhile we use this quick fix (achim)
+	    
+			install -d ${D}/lib/modules/`uname -r`
+			try make INSTALL_MOD_PATH=${D} modules_install
+	    
+			depmod -b ${D} -F ${S}/System.map ${KV}	
+			#rm -rf ${D}/lib/modules/`uname -r`
+			#fix symlink
+			cd ${D}/lib/modules/${KV}
+			rm build
+			ln -sf /usr/src/linux-${KV} build
+		fi
+
+#       if [ "`use alsa`" ]
+#       then
+#		  	#install ALSA modules
+#           cd ${KS}/extras/alsa-driver-${AV}
+#			dodoc INSTALL FAQ
+#			dodir /lib/modules/${KV}/misc
+#			cp modules/*.o ${D}/lib/modules/${KV}/misc
+#       fi
+		if [ "`use pcmcia-cs`" ]
+		then
+			#install PCMCIA modules and utilities
+			cd ${KS2}/pcmcia-cs-${PCV}
+			try make PREFIX=${D} MANDIR=${D}/usr/share/man install  
+			rm -rf ${D}/etc/rc.d
+			exeinto /etc/rc.d/init.d
+			doexe ${FILESDIR}/${KV}/pcmcia
+		fi	    
+	else
+		dodir /usr/src
+		cd ${S}
+		#make mrproper
+
+		if [ "`use build`" ] ; then
+			dodir /usr/src/linux-${KV}
+			#grab includes and documentation only
+			echo ">>> Copying includes..."
+			cp -ax ${S}/include ${D}/usr/src/linux-${KV}
+		else
+			echo ">>> Copying sources..."
+			cp -ax ${S} ${D}/usr/src
+		fi
+	fi	
+    if [ "$PN" != "linux-extras" ]
+    then
+		#don't overwrite existing .config if present
+		cd ${D}/usr/src/linux-${KV}
+		if [ -e .config ]
+		then
+			cp -a .config .config.eg
+		fi
+	fi
+}
+
+pkg_postinst() {
+    rm -f ${ROOT}/usr/src/linux
+    ln -sf linux-${KV} ${ROOT}/usr/src/linux
+    
+    #copy over our .config if one isn't already present
+    cd ${ROOT}/usr/src/linux-${KV}
+    if [ "${PN}" = "linux-sources" ] && [ -e .config.eg ] && [ ! -e .config ]
+    then
+		cp -a .config.eg .config
+    fi
+}