new version, cleaned up pre-r9 stuff

10 files changed, 40 insertions, 353 deletions

diff --git a/sys-kernel/lolo-sources/ChangeLog b/sys-kernel/lolo-sources/ChangeLog
index 6a120981daef..e4532b2c8f08 100644
--- a/sys-kernel/lolo-sources/ChangeLog
+++ b/sys-kernel/lolo-sources/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for sys-kernel/lolo-sources
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/lolo-sources/ChangeLog,v 1.7 2002/09/19 21:32:30 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/lolo-sources/ChangeLog,v 1.8 2002/09/21 22:32:58 lostlogic Exp $
+
+*lolo-sources-2.4.19.10_pre2 (21 Sep 2002)
+
+  21 Sep 2002; Brandon Low <lostlogic@gentoo.org> lolo-sources-2.4.19.10_pre2.ebuild:
+
+  Due to difficulties in getting updates, we had to drop the planned
+  fixes for amd74xx (amd760mpx), hpt366 (hpt370+), and radeonfb...
+
+  I also haven't been having luck finding fixes for sim710.c or i810_dma.c
+
+  However, I think that the other things that have gone into this kernel
+  warrant it's release as -r10 with only the additional work noted below.
+
+  New this version:
+  - Add and re-arrange VIA bugfixes
+  - LVcool AMD Athlon/Duron Cooling
+  - Update grsecurity
+  - Switch to latest release IPSEC Free S/WAN
+  - Add usbdnet support for Zaurus handhelds
+  - Change versioning again, now I can use a consistant method to create
+    versions for all the kernels that I do the ebuilds for.  This kernel
+    is now 2.4.19-lolo-r10_pre2
+
+  Coming before gentoo-sources-2.4.19-r10:
+  - Add a method for users to turn off patches with a shell var
+  - updated defconfig patch with better defaults for i386
+  - updated and improved patches.txt documentation
+  - incorporate ACPI from acpi.sourceforge.net (this is now debatible,
+    mjc says that it can still physically break machines, this may
+    become an optional patch maybe I'll do the merge and leave it to
+    users to use it if they want to.)
 
 *lolo-sources-2.4.19.10_pre1 (19 Sep 2002)
 
diff --git a/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.10_pre2 b/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.10_pre2
new file mode 100644
index 000000000000..89548b44dd36
--- /dev/null
+++ b/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.10_pre2
@@ -0,0 +1,2 @@
+MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
+MD5 3056a9746ae65d2acccff700f01fde0e patches-2.4.19-lolo-r10_pre2.tar.bz2 1406982
diff --git a/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_pre1 b/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_pre1
deleted file mode 100644
index 0ab71c81cb7b..000000000000
--- a/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 55506b7f1b17209dba72c5259c74e422 patches-2.4.19.9_pre1.tar.bz2 1267287
diff --git a/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_pre2 b/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_pre2
deleted file mode 100644
index fcd24c930e8b..000000000000
--- a/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 b7d6bc4dcfde9c23f1e725b9cba42ed9 patches-2.4.19.9_pre2.tar.bz2 1274183
diff --git a/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_rc1 b/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_rc1
deleted file mode 100644
index 38c17f962e44..000000000000
--- a/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_rc1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 abb55958e03e6677dd7e0f8c31a11337 patches-2.4.19.9_rc1.tar.bz2 1272950
diff --git a/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_rc2 b/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_rc2
deleted file mode 100644
index a23afe8af40f..000000000000
--- a/sys-kernel/lolo-sources/files/digest-lolo-sources-2.4.19.9_rc2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 a494d33cf79e545928447d72da90c617 patches-2.4.19.9_rc2.tar.bz2 1330213
diff --git a/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_rc2.ebuild b/sys-kernel/lolo-sources/lolo-sources-2.4.19.10_pre2.ebuild
index dd519e10fd90..9d19fc19369d 100644
--- a/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_rc2.ebuild
+++ b/sys-kernel/lolo-sources/lolo-sources-2.4.19.10_pre2.ebuild
@@ -3,9 +3,10 @@
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 #we use this next variable to avoid duplicating stuff on cvs
-OKV=2.4.19
-KV=${PV}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
+OKV="`echo ${PV}|sed -e 's:\(^.*\)\.[^\.]*:\1:'`"
+EXTRAVERSION="`echo ${P} | \
+	sed -e 's:^\(.*\)-sources-[0-9]\+\.[0-9]\+\.[0-9]\+.r*\([0-9]*\)\(.*$\):-\1-r\2\3:'`"
+KV=${OKV}${EXTRAVERSION}
 S=${WORKDIR}/linux-${KV}
 ETYPE="sources"
 
@@ -24,8 +25,8 @@ KEYWORDS="x86 -ppc -sparc -sparc64"
 if [ $ETYPE = "sources" ]
 then
 	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND="!build? ( >=sys-devel/binutils-2.11.90.0.31 )"
-	RDEPEND="${RDEPEND}
+	DEPEND="!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )"
+	RDEPEND="${DEPEND}
 		 !build? ( >=sys-libs/ncurses-5.2
 			   sys-devel/perl
 			   >=sys-apps/modutils-2.4.2
diff --git a/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_pre1.ebuild b/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_pre1.ebuild
deleted file mode 100644
index 2aad5b8bff26..000000000000
--- a/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_pre1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-OKV=2.4.19
-KV=${PV}
-EXTRAVERSION="`echo ${KV}|sed -e 's:.*\(\.[^\.]*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-[ -z "${ETYPE}" ] && ETYPE="sources"
-
-#Documentation on the patches contained in this kernel will be installed
-#to /usr/share/doc/lolo-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for lostlogic's Gentoo Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV}.tar.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc -sparc64"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND="${RDEPEND}
-		 >=sys-libs/ncurses-5.2
-		 sys-devel/perl
-		 >=sys-apps/modutils-2.4.2
-		 sys-devel/make"
-fi
-
-DEPEND="${DEPEND} app-admin/addpatches"
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	# Now we need to deal with the tarball of patches.
-	cd ${KV}
-	[ `use crypt` ] || rm 8*
-	addpatches . ${WORKDIR}/linux-${KV}
-
-	cd ../linux-${KV}
-	
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make distclean || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		cat ${WORKDIR}/${KV}/docs/* > patches.txt
-		dodoc patches.txt
-		mv ${WORKDIR}/linux* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_pre2.ebuild b/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_pre2.ebuild
deleted file mode 100644
index a96d49b2859f..000000000000
--- a/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_pre2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-OKV=2.4.19
-KV=${PV}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-#Documentation on the patches contained in this kernel will be installed
-#to /usr/share/doc/lolo-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for lostlogic's Gentoo Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV}.tar.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc -sparc64"
-
-if [ $ETYPE = "sources" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND="!build? ( >=sys-devel/binutils-2.11.90.0.31 )"
-	RDEPEND="${RDEPEND}
-		 !build? ( >=sys-libs/ncurses-5.2
-			   sys-devel/perl
-			   >=sys-apps/modutils-2.4.2
-			   sys-devel/make )"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	# Now we need to deal with the tarball of patches.
-	cd ${KV}
-	[ `use crypt` ] || rm 8*
-	#Thers is some anti-grsecurity sentiment, so I'll
-	#make it easy not to patch it in.
-	#Uncomment the following line to not patch grsecurity.
-	rm 14*
-
-	./addpatches . ${WORKDIR}/linux-${KV}
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	# also fix the EXTRAVERSION
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-	
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make distclean || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		cat ${WORKDIR}/${KV}/docs/* > patches.txt
-		dodoc patches.txt
-		mv ${WORKDIR}/linux* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_rc1.ebuild b/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_rc1.ebuild
deleted file mode 100644
index f66bc6a33d03..000000000000
--- a/sys-kernel/lolo-sources/lolo-sources-2.4.19.9_rc1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-OKV=2.4.19
-KV=${PV}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-#Documentation on the patches contained in this kernel will be installed
-#to /usr/share/doc/lolo-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for lostlogic's Gentoo Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV}.tar.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc -sparc64"
-
-if [ $ETYPE = "sources" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND="!build? ( >=sys-devel/binutils-2.11.90.0.31 )"
-	RDEPEND="${RDEPEND}
-		 !build? ( >=sys-libs/ncurses-5.2
-			   sys-devel/perl
-			   >=sys-apps/modutils-2.4.2
-			   sys-devel/make )"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	# Now we need to deal with the tarball of patches.
-	cd ${KV}
-	[ `use crypt` ] || rm 8*
-	#Thers is some anti-grsecurity sentiment, so I'll
-	#make it easy not to patch it in.
-	#Uncomment the following line to not patch grsecurity.
-	#rm 14*
-
-	./addpatches . ${WORKDIR}/linux-${KV}
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	# also fix the EXTRAVERSION
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-	
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make distclean || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		cat ${WORKDIR}/${KV}/docs/* > patches.txt
-		dodoc patches.txt
-		mv ${WORKDIR}/linux* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}