version bump for genpatches

4 files changed, 164 insertions, 14 deletions

diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index 75ad294091e8..c4c1417d7639 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/gentoo-dev-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.28 2004/01/11 22:53:51 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.29 2004/01/12 20:51:33 brad_mssw Exp $
+
+*gentoo-dev-sources-2.6.1-r1 (12 Jan 2004)
+
+  12 Jan 2004; Brad House <brad_mssw@gentoo.org>
+  gentoo-dev-sources-2.6.1-r1.ebuild:
+  Genpatches experimental changes. KEYWORDed -* for now until further testing is
+  complete
 
   11 Jan 2004; John Mylchreest <johnm@gentoo.org> :
   cleanup in prep for eclass migration
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index e7ba9f2a6d91..b712bb3a9ec6 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,18 +1,10 @@
-MD5 b286b084be5f684d43f6c041530cce72 gentoo-dev-sources-2.6.1_rc1.ebuild 4766
+MD5 3290b3a2f95158aa5147a0c9430ce3b5 ChangeLog 6266
+MD5 c65816e16465db58bd432fe4ecae0de6 gentoo-dev-sources-2.6.1-r1.ebuild 4101
+MD5 bb4d67e58a7a9ecd9069931f3c49dcc6 gentoo-dev-sources-2.6.1_rc2.ebuild 4103
 MD5 813135a1199ca9450ac9a3ef14e9da04 gentoo-dev-sources-2.6.1_rc3.ebuild 4103
-MD5 5b15b4e74b8a38266d35f4c41655cdd4 gentoo-dev-sources-2.6.0-r2.ebuild 3412
 MD5 cd1ecd18f5866d7091f7f47c25ab8c65 gentoo-dev-sources-2.6.1.ebuild 4099
-MD5 bb4d67e58a7a9ecd9069931f3c49dcc6 gentoo-dev-sources-2.6.1_rc2.ebuild 4103
-MD5 447664c741a2a2eaa6893fd473459344 gentoo-dev-sources-2.6.0-r1.ebuild 3300
-MD5 877780ca40dc7fbd63a8fffd845b960d gentoo-dev-sources-2.6.0.ebuild 3294
-MD5 b774a8a0f954436e90cbf76bdb7b9f0a ChangeLog 6038
 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636
-MD5 8b04a6ad4ec76162d35d0fc7aec661fe gentoo-dev-sources-2.6.1_rc1-r1.ebuild 4773
-MD5 0bb5e60d954d4e595f357475973e279f files/digest-gentoo-dev-sources-2.6.0 137
-MD5 1afc82248866f1db6529bdb8296d59e1 files/digest-gentoo-dev-sources-2.6.1 138
-MD5 8104284047ea615d1ddcd79fa96e65fc files/digest-gentoo-dev-sources-2.6.0-r1 138
-MD5 e7ee256f3e809a78b23313a7c73e7e97 files/digest-gentoo-dev-sources-2.6.0-r2 140
-MD5 049cf3bb4dbeb55995bad1459931c3b5 files/digest-gentoo-dev-sources-2.6.1_rc1 202
+MD5 150fc6d514e8cb2b07a3a7b14b8d92ef files/digest-gentoo-dev-sources-2.6.1-r1 138
 MD5 11f11e1b2cae7428596558dd3c9a7635 files/digest-gentoo-dev-sources-2.6.1_rc2 202
 MD5 4838415b41e807f05b35b5efd8cfcb95 files/digest-gentoo-dev-sources-2.6.1_rc3 202
-MD5 4346afe08b15d90a55c65d40c82a4d17 files/digest-gentoo-dev-sources-2.6.1_rc1-r1 202
+MD5 1afc82248866f1db6529bdb8296d59e1 files/digest-gentoo-dev-sources-2.6.1 138
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r1 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r1
new file mode 100644
index 000000000000..278e229f9d2c
--- /dev/null
+++ b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r1
@@ -0,0 +1,2 @@
+MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
+MD5 bed91d4da1a7225e01da3a36ef5def05 genpatches-2.6-1.16.tar.bz2 539827
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..3f4c9a3a4bf6
--- /dev/null
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2004 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.1-r1.ebuild,v 1.1 2004/01/12 20:51:33 brad_mssw Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel
+
+# Kernel Version before Gentoo Patches
+TKV=${PV/-r*/}
+OKV=${TKV/_rc/-rc}
+OKV=${OKV/_pre/-bk}
+
+KVONLY=${OKV/-*/}
+KEXT=${TKV/${KVONLY}/}
+KMAJ=`echo ${KVONLY} | cut -d. -f1`
+KMIN=`echo ${KVONLY} | cut -d. -f2`
+KREL=`echo ${KVONLY} | cut -d. -f3`
+
+# Kernel Version before official Patches
+if [ "${KEXT}" = "" ]
+then
+	OFFICIAL_KV=${KVONLY}
+else
+	OFFICIAL_KV="${KMAJ}.${KMIN}.`expr ${KREL} - 1`"
+fi
+
+#version of gentoo patchset
+# set to 0 for no patchset
+GPV=1.16
+
+[ ${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/"
+
+if [ "${GPV}" != "0" ]
+then
+	GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/DO_NOT_UPLOAD_TO_MIRRORS_WITHOUT_ASKING_ME_FIRST/genpatches-2.6-${GPV}.tar.bz2"
+#	GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
+fi
+if [ "${KEXT}" != "" ]
+then
+	KP_SRC="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
+fi
+
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OFFICIAL_KV}.tar.bz2
+	${KP_SRC}
+	${GPV_SRC}"
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="-*"
+#KEYWORDS="-* x86 amd64 ~mips ~hppa ~sparc ~alpha"
+PROVIDE="virtual/linux-sources virtual/alsa"
+RESTRICT="nomirror"
+
+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}
+
+	if [ "${GPV}" != "0" ]
+	then
+		unpack genpatches-2.6-${GPV}.tar.bz2
+	fi
+	unpack linux-${OFFICIAL_KV}.tar.bz2
+	mv linux-${OFFICIAL_KV} linux-${KV} || die "Unable to move source tree to ${KV}."
+	cd ${S}
+
+	if [ "${KEXT}" != "" ]
+	then
+		epatch "${DISTDIR}/patch-${OKV}.bz2"
+	fi
+
+	if [ "${GPV}" != "0" ]
+	then
+		# apply gentoo patches
+		# epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
+		PATCHES=`find ${WORKDIR}/genpatches-2.6-${GPV} -type f -name *.patch | sort`
+		for file in ${PATCHES}
+		do
+			epatch $file
+		done
+	fi
+
+	# 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
+	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 options are:"
+	ewarn "Device Drivers -> Character devices -> Unix98 PTY support and"
+	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
+}