version bump

8 files changed, 283 insertions, 8 deletions

diff --git a/sys-kernel/development-sources/ChangeLog b/sys-kernel/development-sources/ChangeLog
index de9028df8de6..a2a6d9132e51 100644
--- a/sys-kernel/development-sources/ChangeLog
+++ b/sys-kernel/development-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/development-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/development-sources/ChangeLog,v 1.63 2003/12/17 19:42:29 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/development-sources/ChangeLog,v 1.64 2003/12/18 05:03:11 brad_mssw Exp $
+
+*development-sources-2.6.0 (18 Dec 2003)
+
+  18 Dec 2003; Brad House <brad_mssw@gentoo.org>
+  development-sources-2.6.0.ebuild:
+  Add official 2.6.0 branch. Please do not patch this kernel, it should stay
+  vanilla, gentoo-dev-sources is the one you want to patch
 
   09 Dec 2003; <spider@gentoo.org> development-sources-2.6.0_beta7-r3.ebuild,
   development-sources-2.6.0_beta7-r5.ebuild,
diff --git a/sys-kernel/development-sources/Manifest b/sys-kernel/development-sources/Manifest
index a178ff587d76..e28a3590c242 100644
--- a/sys-kernel/development-sources/Manifest
+++ b/sys-kernel/development-sources/Manifest
@@ -1,18 +1,20 @@
-MD5 8d5e66e38a8121af1df43474b0cf9304 ChangeLog 11649
+MD5 d7ff431ade9c88191230b812dca38249 ChangeLog 11916
+MD5 e8f7ef9b4384ad2c26066eafdd7bfece development-sources-2.6.0_beta9.ebuild 3703
 MD5 6b5e59a4f144dc9cb21774286bdc41d6 development-sources-2.6.0_beta10.ebuild 3968
 MD5 1ee67f582ee9017bacb60413d4d88efb development-sources-2.6.0_beta11.ebuild 4926
+MD5 07b78dadb0c0b81ad1b5fbd5f32ba587 development-sources-2.6.0.ebuild 4147
 MD5 f900f573cbb274ee4774d696a3081364 development-sources-2.6.0_beta7-r2.ebuild 3281
 MD5 1a736ea9b2bcf4365d4abd70f8cb4fe9 development-sources-2.6.0_beta7-r3.ebuild 3282
-MD5 6e22e38c974b35229986d7307f78cc89 development-sources-2.6.0_beta7-r5.ebuild 3534
 MD5 3b4016ecfb9d8924b33cf582f96c9cbe development-sources-2.6.0_beta7.ebuild 3276
-MD5 fd51ed408069086c547feaed84757e94 development-sources-2.6.0_beta8.ebuild 4047
-MD5 e8f7ef9b4384ad2c26066eafdd7bfece development-sources-2.6.0_beta9.ebuild 3703
 MD5 854abf2bdb617fe8c7de18312a60bb85 metadata.xml 442
+MD5 6e22e38c974b35229986d7307f78cc89 development-sources-2.6.0_beta7-r5.ebuild 3534
+MD5 fd51ed408069086c547feaed84757e94 development-sources-2.6.0_beta8.ebuild 4047
+MD5 1e74dae3e6fdb1fdf45dae97e8344654 files/digest-development-sources-2.6.0_beta9 72
 MD5 28de27c6363e120e0c1b0fd9994acfab files/digest-development-sources-2.6.0_beta10 73
 MD5 c8d4422ae4c4145498a38ba24574efeb files/digest-development-sources-2.6.0_beta11 360
+MD5 b058d2842425a7a4bad9688d9e694309 files/digest-development-sources-2.6.0 66
 MD5 c89934022d76ba15351646073fa260b8 files/digest-development-sources-2.6.0_beta7 72
 MD5 ce48c553976e08231fcdb58faa02517d files/digest-development-sources-2.6.0_beta7-r2 141
 MD5 eed41ceb58615452740b71330342ab0d files/digest-development-sources-2.6.0_beta7-r3 142
 MD5 9824da01b9169b0253ec532e1169b430 files/digest-development-sources-2.6.0_beta7-r5 218
 MD5 159bd39720276be321a3e23ad6a53a6e files/digest-development-sources-2.6.0_beta8 142
-MD5 1e74dae3e6fdb1fdf45dae97e8344654 files/digest-development-sources-2.6.0_beta9 72
diff --git a/sys-kernel/development-sources/development-sources-2.6.0.ebuild b/sys-kernel/development-sources/development-sources-2.6.0.ebuild
new file mode 100644
index 000000000000..88aeb7d31b66
--- /dev/null
+++ b/sys-kernel/development-sources/development-sources-2.6.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/development-sources/development-sources-2.6.0.ebuild,v 1.1 2003/12/18 05:03:11 brad_mssw Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+#Original Kernel Version before Patches
+# eg: 2.6.0-test8
+OKV=${PV/_beta/-test}
+OKV=${OKV/-r*//}
+
+#Kernel version after patches
+# eg: 2.6.0-test8-bk1
+KV=${PF/_beta/-test}
+KV=${KV/-r/-bk}
+KV=${KV//${PN}-}
+
+#version of gentoo patchset
+# This should always be zero now, as this is back to vanilla
+GPV=0
+
+S=${WORKDIR}/linux-${OKV}
+ETYPE="sources"
+
+DESCRIPTION="Full sources for the Development Branch of the Linux kernel"
+
+
+# THIS IS VANILLA ONLY! DO NOT ADD PATCHES, USE gentoo-dev-sources FOR THAT !!!!!!
+[ ! ${GPV} == 0 ] && GPATCH_URI="mirror://gentoo/distfiles/genpatches-2.6-${GPV}.tar.bz2"
+[ -z ${KV/*-bk*/} ] && PATCH_URI="http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-${KV}.bz2"
+
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 ${PATCH_URI} ${GPATCH_URI}"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="-* x86 amd64"
+PROVIDE="virtual/linux-sources virtual/alsa"
+
+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=">=sys-libs/ncurses-5.2 dev-lang/perl
+		 sys-devel/make
+		 sys-apps/module-init-tools"
+fi
+
+[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack linux-${OKV}.tar.bz2
+
+	# apply bk pulls	
+	if [ -z ${KV/*-bk*/} ]
+	then
+		cd ${S}
+		epatch ${DISTDIR}/patch-${KV}.bz2
+		cd ${WORKDIR}
+	fi
+
+	# apply gentoo patches	
+	if [ ! ${GPV} == 0 ]
+	then
+		cd ${S}
+		epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
+		KV="${KV}-patchset-${GPV}"
+		cd ${WORKDIR}
+	fi
+
+	# move to appropriate src dir
+	if [ ! ${KV} == ${OKV} ]
+	then
+		mv linux-${OKV} linux-${KV}
+		S=${WORKDIR}/linux-${KV}
+	fi
+
+	cd ${S}
+	unset ARCH
+	#sometimes we have icky kernel symbols; this seems to get rid of them
+	make mrproper || die
+
+	#fix silly permissions in tarball
+	cd ${WORKDIR}
+	chown -R 0:0 *
+	chmod -R a+r-w+X,u+w *
+}
+
+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..."
+		mv ${WORKDIR}/* ${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
+	[ ! ${GPV} == 0 ] && KV="${KV}-patchset-${GPV}"
+	[ ! -e "${ROOT}usr/src/linux-beta" ] && ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
+	[ ! -e "${ROOT}usr/src/linux" ] && ln -sf linux-${KV} ${ROOT}/usr/src/linux
+	mkdir -p ${ROOT}sys
+
+	ewarn "Please note that ptyfs support has been removed from devfs"
+	ewarn "and you have to compile it in now, or else you will get"
+	ewarn "errors when trying to open a pty. The option is:"
+	ewarn "File systems -> Pseudo filesystems -> /dev/pts filesystem."
+	echo
+	ewarn "Also, note that you must compile in support for"
+	ewarn "input devices (Input device support->Input devices),"
+	ewarn "the virtual terminal (Character Devices->Virtual terminal),"
+	ewarn "vga_console (Graphics Support->Console...->VGA text console)"
+	ewarn "and the vt_console (Character Devices->Support for console...)."
+	ewarn "Otherwise, you will get the dreaded \"Uncompressing the Kernel\""
+	ewarn "error."
+	echo
+	ewarn "PLEASE NOTE THIS IS NOT OFFICIALLY SUPPORTED BY GENTOO."
+	echo
+	sleep 5
+
+}
diff --git a/sys-kernel/development-sources/files/digest-development-sources-2.6.0 b/sys-kernel/development-sources/files/digest-development-sources-2.6.0
new file mode 100644
index 000000000000..7c2469b8a392
--- /dev/null
+++ b/sys-kernel/development-sources/files/digest-development-sources-2.6.0
@@ -0,0 +1 @@
+MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index 780c9717bf16..8f73ec9a3b68 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/gentoo-dev-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.12 2003/12/14 20:29:46 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.13 2003/12/18 05:07:17 brad_mssw Exp $
+
+*gentoo-dev-sources-2.6.0 (18 Dec 2003)
+
+  18 Dec 2003; Brad House <brad_mssw@gentoo.org>
+  gentoo-dev-sources-2.6.0.ebuild:
+  version bump to 2.6.0 view patches at
+  http://dev.gentoo.org/~brad_mssw/kernel_patches/2.6.0/genpatches-2.6-0.9.tar.b
+  z2
 
   14 Dec 2003; Brad House <brad_mssw@gentoo.org>
   gentoo-dev-sources-2.6.0_beta11-r2.ebuild:
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index 60812c841a63..514e1c02b6e6 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 3756bd965c43dec8e16ec88bba2cc918 ChangeLog 2569
+MD5 804f5c9fca6b6eaed7969d8bc79fbf24 ChangeLog 2821
 MD5 6f63cb99dc8533aeca57408321c91cd1 gentoo-dev-sources-2.6.0_beta9.ebuild 2352
 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636
 MD5 a4d672f58dc685b5403312ae1e9db563 gentoo-dev-sources-2.6.0_beta10.ebuild 2632
@@ -6,9 +6,11 @@ MD5 3aa2de29714ded6575c28ef08452319c gentoo-dev-sources-2.6.0_beta10-r1.ebuild 3
 MD5 e47d675b21d3c3c710142ecebd3b9039 gentoo-dev-sources-2.6.0_beta11.ebuild 3216
 MD5 77c5731b696e03a6cb31b62435b685e8 gentoo-dev-sources-2.6.0_beta11-r1.ebuild 3219
 MD5 85948c4ad067e60876f8f27a9edd272c gentoo-dev-sources-2.6.0_beta11-r2.ebuild 3307
+MD5 622ff33812e13d1ad732ed824cbc4962 gentoo-dev-sources-2.6.0.ebuild 3297
 MD5 2c930a031439b36d073cdbadc16a5bbc files/digest-gentoo-dev-sources-2.6.0_beta9 142
 MD5 8ddadf31b5dcf41e4a17ba7b2e7f4ac1 files/digest-gentoo-dev-sources-2.6.0_beta10 144
 MD5 c242a7844916262f087398b60ec62705 files/digest-gentoo-dev-sources-2.6.0_beta10-r1 144
 MD5 a6f41cae4fa405138226dfb227911003 files/digest-gentoo-dev-sources-2.6.0_beta11 144
 MD5 1a88dcc33b21c4109ce7cf693b43b974 files/digest-gentoo-dev-sources-2.6.0_beta11-r1 144
 MD5 d472f52790525a410af311ff82b4e179 files/digest-gentoo-dev-sources-2.6.0_beta11-r2 144
+MD5 0bb5e60d954d4e595f357475973e279f files/digest-gentoo-dev-sources-2.6.0 137
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0
new file mode 100644
index 000000000000..26eeecbcebfe
--- /dev/null
+++ b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0
@@ -0,0 +1,2 @@
+MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
+MD5 8d87ca955f4ef2dca114bfb73c689934 genpatches-2.6-0.9.tar.bz2 337422
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0.ebuild
new file mode 100644
index 000000000000..eab0cd44e8e0
--- /dev/null
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0.ebuild,v 1.1 2003/12/18 05:07:17 brad_mssw Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel
+
+#Original Kernel Version before Patches
+# eg: 2.6.0-test8
+OKV=${PV/_beta/-test}
+OKV=${OKV/-r*//}
+
+#version of gentoo patchset
+GPV=0.9
+
+[ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
+KV=${OKV}${EXTRAVERSION}
+
+S=${WORKDIR}/linux-${KV}
+
+DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/2.6.0/genpatches-2.6-${GPV}.tar.bz2"
+#GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
+	 ${GPV_SRC}"
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="-* x86 amd64 ~mips ~hppa ~sparc ~alpha"
+PROVIDE="virtual/linux-sources virtual/alsa"
+
+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=">=sys-libs/ncurses-5.2 dev-lang/perl
+		 sys-devel/make
+		 sys-apps/module-init-tools"
+fi
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack genpatches-2.6-${GPV}.tar.bz2
+	unpack linux-${OKV}.tar.bz2
+	mv linux-${OKV} linux-${KV} || die "Unable to move source tree to ${KV}."
+	cd ${S}
+
+	# apply gentoo patches
+	# epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
+	PATCHES=`find ${WORKDIR}/genpatches-${GPV} -type f -name *.patch | sort`
+	for file in ${PATCHES}
+	do
+		epatch $file
+	done
+
+	# Our EXTRAVERSION needs to be appended to the end for the Makefile
+	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
+	-e "s:EXTRAVERSION = \(.\+\):EXTRAVERSION = \1${EXTRAVERSION}:" Makefile > Makefile.new
+#	rm -f Makefile
+#	mv Makefile.new Makefile
+
+	kernel_universal_unpack
+
+	# Working around a bug in kernel.eclass, move the .new file after universal_unpack
+	rm -f Makefile
+	mv Makefile.new Makefile
+}
+
+pkg_install() {
+	kernel_src_install
+}
+
+pkg_postinst() {
+	kernel_pkg_postinst
+
+	if [ ! -h "/usr/src/linux-beta" ]
+	then
+		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux-beta
+	fi
+
+	if [ ! -h "/usr/src/linux" ]
+	then
+		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux
+	fi
+
+	# Don't forget to make directory for sysfs
+	if [ ! -d "/sys" ]
+	then
+		mkdir /sys
+	fi
+
+	echo
+	eerror "IMPORTANT:"
+	eerror "ptyfs support has now been dropped from devfs and as a"
+	eerror "result you are now required to compile this support into"
+	eerror "the kernel. You can do so by enabling the following option"
+	eerror "	File systems -> Pseudo filesystems -> /dev/pts filesystem."
+	echo
+	eerror "To prevent the problem while uncompressing the kernel image"
+	eerror "you should also enable:"
+	eerror "	Input Devices (Input Device Support -> Input Devices),"
+	eerror "	Virtual Terminal (Character Devices -> Virtual Terminal),"
+	eerror "	vga_console (Graphics Support -> Console... -> VGA Text Console)"
+	eerror "	vt_console (Character Devices -> Support for Console...)."
+	echo
+}