Version bump for new xen-3 snapshot.

(Portage version: 2.0.53_rc3)

6 files changed, 67 insertions, 49 deletions

diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index 70fa6b38d8c1..14c40b41d577 100644
--- a/sys-kernel/xen-sources/ChangeLog
+++ b/sys-kernel/xen-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/xen-sources
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.4 2005/09/22 22:32:34 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.5 2005/10/08 12:36:42 chrb Exp $
+
+*xen-sources-2.6.12.5-r1 (08 Oct 2005)
+
+  08 Oct 2005; Chris Bainbridge <chrb@gentoo.org> +files/mkbuildtree.patch,
+  -xen-sources-2.6.12.5.ebuild, +xen-sources-2.6.12.5-r1.ebuild:
+  Version bump for new xen-3 snapshot.
 
 *xen-sources-2.6.11.12 (22 Sep 2005)
 
diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest
index 2b715dc5513d..dba36e80e989 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -1,6 +1,7 @@
-MD5 498f781a05c0b97867b686ccd4ec96b9 ChangeLog 1008
+MD5 94ded2bfeeafb4083ad2ffec43065fae ChangeLog 1229
+MD5 06a14308b8fa32d0bfdcbdaa29f0755c files/digest-xen-sources-2.6.11.12 130
+MD5 1e5eb9636a35e0d31d589cf76c445af7 files/digest-xen-sources-2.6.12.5-r1 204
+MD5 2b3d2f6544952b8d49b77292ed16b249 files/mkbuildtree.patch 698
 MD5 23ec60d5040f966fda250a47d8903428 metadata.xml 252
-MD5 c65785b52914d837701380016454f884 xen-sources-2.6.12.5.ebuild 1260
 MD5 dc054363180133f05f3d1561f683c87e xen-sources-2.6.11.12.ebuild 1266
-MD5 06a14308b8fa32d0bfdcbdaa29f0755c files/digest-xen-sources-2.6.11.12 130
-MD5 3cdceca5bc99850a0ff128a97e370653 files/digest-xen-sources-2.6.12.5 129
+MD5 513b0afbc217052b602a238d688bd337 xen-sources-2.6.12.5-r1.ebuild 1123
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5-r1
index 4963558c1ad3..e0b43f2aa82d 100644
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5-r1
@@ -1,2 +1,3 @@
-MD5 cff8abb6a5a992018cbcf382ff95c577 patch-2.6.12.5.bz2 14588
 MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 cff8abb6a5a992018cbcf382ff95c577 patch-2.6.12.5.bz2 14588
+MD5 4fb82af4348b4fac179a5da6044aea68 xen-unstable-20051007.tar.bz2 3608261
diff --git a/sys-kernel/xen-sources/files/mkbuildtree.patch b/sys-kernel/xen-sources/files/mkbuildtree.patch
new file mode 100644
index 000000000000..6174215fda18
--- /dev/null
+++ b/sys-kernel/xen-sources/files/mkbuildtree.patch
@@ -0,0 +1,19 @@
+--- linux-2.6-xen-sparse/mkbuildtree.orig	2005-10-07 19:04:20.000000000 +0100
++++ linux-2.6-xen-sparse/mkbuildtree	2005-10-07 21:19:15.000000000 +0100
+@@ -104,14 +104,14 @@
+ for i in `find . -type l`; do rm -f $i; done
+ 
+ # Create symlinks of files and directories which exist in the sparse source
+-relative_lndir ${RS}
++cp -dpPR ${RS}/* .
+ rm -f mkbuildtree
+ 
+ # Create links to the shared definitions of the Xen interfaces.
+ rm -rf ${AD}/include/asm-xen/xen-public
+ mkdir  ${AD}/include/asm-xen/xen-public
+ cd     ${AD}/include/asm-xen/xen-public
+-relative_lndir ../../../${RS}/../xen/include/public
++cp -dpPR ../../../${RS}/../xen/include/public/* .
+ 
+ # Arch-specific post-processing
+ cd ${AD}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.12.5-r1.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.12.5-r1.ebuild
new file mode 100644
index 000000000000..bf59f60f2523
--- /dev/null
+++ b/sys-kernel/xen-sources/xen-sources-2.6.12.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.12.5-r1.ebuild,v 1.1 2005/10/08 12:36:42 chrb Exp $
+
+ETYPE="sources"
+inherit kernel-2 eutils
+detect_arch
+detect_version
+
+EXTRAVERSION=".${KV_EXTRA}-xen"
+
+DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
+HOMEPAGE="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html"
+DATE="20051007"
+SRC_URI="${KERNEL_URI} mirror://gentoo/xen-unstable-${DATE}.tar.bz2"
+
+KEYWORDS="~x86"
+DEPEND="=app-emulation/xen-3.0.0_pre${DATE}"
+S="${WORKDIR}"
+RESTRICT="nostrip"
+
+src_unpack() {
+	unpack xen-unstable-${DATE}.tar.bz2
+	cd xen-unstable-${DATE}
+	patch -p0 < ${FILESDIR}/mkbuildtree.patch
+	make LINUX_SRC_PATH=${DISTDIR} -f buildconfigs/mk.linux-2.6-xen \
+		linux-2.6.12-xen/include/linux/autoconf.h
+	t=linux-2.6.12-xen
+	cp XEN-VERSION ${t}
+	echo ARCH=xen | cat - ${t}/Makefile | sed -e "s/-xen/.5-xen/" >${t}/Makefile.0
+	mv ${t}/Makefile.0 ${t}/Makefile
+	mv ${t} ${WORKDIR}/linux-2.6.12.5-xen
+	rm -rf ${WORKDIR}/xen-unstable-${DATE}
+}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.12.5.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.12.5.ebuild
deleted file mode 100644
index 43933dfcdf5f..000000000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.12.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.12.5.ebuild,v 1.3 2005/09/19 16:47:21 chrb Exp $
-
-ETYPE="sources"
-inherit kernel-2 eutils
-detect_arch
-detect_version
-
-EXTRAVERSION=".${KV_EXTRA}-xen"
-
-DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
-HOMEPAGE="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~x86"
-DEPEND=">=app-emulation/xen-3.0.0_pre20050906"
-
-src_unpack() {
-	# unpack kernel
-	kernel-2_src_unpack
-
-	# apply required xen patches for this kernel
-	if [ -e /usr/share/xen/patches/linux-${OKV}.tar.bz2 ]; then
-	    XEN_PATCHES=/usr/share/xen/patches/linux-${OKV}.tar.bz2
-	    einfo "Extracting patches from ${XEN_PATCHES} ..."
-	    tar -jxf ${XEN_PATCHES}
-	    for p in linux-${OKV}/*.patch; do
-	        epatch ${p}
-	    done
-	else
-	    einfo "Xen has no patches for kernel ${OKV}"
-	fi
-
-	x=/usr/share/xen/linux-${KV_MAJOR}.${KV_MINOR}-xen-sparse.tar.bz2
-	einfo "Copying the sparse Xen tree from ${x}"
-	cd ${S}
-	tar -jxf ${x}
-
-	einfo "Setting ARCH to Xen."
-	echo ARCH=xen | cat - ${S}/Makefile >${S}/Makefile.0
-	mv ${S}/Makefile.0 ${S}/Makefile
-}