Bump to 2.6.16-bs2

(Portage version: 2.1_pre10-r2)

5 files changed, 76 insertions, 1 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index df91eef86cdf..59b60b6ee061 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.75 2006/03/02 13:17:03 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.76 2006/05/08 02:35:26 dang Exp $
+
+*usermode-sources-2.6.16 (08 May 2006)
+
+  08 May 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/uml-2.6.16-bs2-new-glibc.patch, +usermode-sources-2.6.16.ebuild:
+  Bump to 2.6.16-bs2
 
 *usermode-sources-2.6.15-r1 (02 Mar 2006)
 
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.15 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.15
index 5d7e9894f4e2..8635eb171470 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.15
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.15
@@ -1,3 +1,7 @@
 MD5 1d5fbdacd817651e4ff4f8ec178ed2d2 genpatches-2.6.15-3.base.tar.bz2 16532
+RMD160 4aaa4ba26655a8fa4480834e50e41a9f885b388d genpatches-2.6.15-3.base.tar.bz2 16532
+SHA256 3d9a8992092d535eaafd61a68357a9293c9d3fe4f2153bff04db7c010c7d110e genpatches-2.6.15-3.base.tar.bz2 16532
 MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
+RMD160 e65904bf253b3515f8dd2a480c7e99ec7117cf60 linux-2.6.15.tar.bz2 39832836
+SHA256 066ec56ce5f57c79a526b6bb3541d32dbf796c11c26c32073fc64b93f09825db linux-2.6.15.tar.bz2 39832836
 MD5 83e7e427eea23c489d6f7419db82fd12 uml-2.6.15-bs1.patch.bz2 16326
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.16 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.16
new file mode 100644
index 000000000000..0b9fbd3c8a20
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.16
@@ -0,0 +1,9 @@
+MD5 a5c5c232a835ac8c96fad6cb673f1bed genpatches-2.6.16-9.base.tar.bz2 73657
+RMD160 96558ce23201286ca1b488561336998f49e35afc genpatches-2.6.16-9.base.tar.bz2 73657
+SHA256 cdad78a9b4c32e0a2bf4a6acfc550f179303e5b462642985eda20caa5003823b genpatches-2.6.16-9.base.tar.bz2 73657
+MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
+RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
+SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
+MD5 97a67a09e25292f7d2a9bb8f38d85cbc uml-2.6.16-bs2.patch.bz2 33936
+RMD160 8a46545ae3ad355feb494d4e5a3f0dad76690aa3 uml-2.6.16-bs2.patch.bz2 33936
+SHA256 aba5949f52f03b08c85171101824c323c7b6a812666ce4049699a8cb9de9d84e uml-2.6.16-bs2.patch.bz2 33936
diff --git a/sys-kernel/usermode-sources/files/uml-2.6.16-bs2-new-glibc.patch b/sys-kernel/usermode-sources/files/uml-2.6.16-bs2-new-glibc.patch
new file mode 100644
index 000000000000..0871343c8381
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/uml-2.6.16-bs2-new-glibc.patch
@@ -0,0 +1,32 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN linux-2.6.16.orig/arch/um/os-Linux/sys-i386/registers.c linux-2.6.16/arch/um/os-Linux/sys-i386/registers.c
+--- linux-2.6.16.orig/arch/um/os-Linux/sys-i386/registers.c	2006-03-20 00:53:29.000000000 -0500
++++ linux-2.6.16/arch/um/os-Linux/sys-i386/registers.c	2006-05-07 18:11:04.000000000 -0400
+@@ -130,6 +130,12 @@
+ 		       HOST_FP_SIZE * sizeof(unsigned long));
+ }
+ 
++#ifndef JB_PC
++#define JB_PC 5
++#define JB_SP 4
++#define JB_BP 3
++#endif
++
+ void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer)
+ {
+ 	struct __jmp_buf_tag *jmpbuf = buffer;
+diff --exclude-from=/home/dang/.diffrc -u -ruN linux-2.6.16.orig/arch/um/os-Linux/sys-x86_64/registers.c linux-2.6.16/arch/um/os-Linux/sys-x86_64/registers.c
+--- linux-2.6.16.orig/arch/um/os-Linux/sys-x86_64/registers.c	2006-03-20 00:53:29.000000000 -0500
++++ linux-2.6.16/arch/um/os-Linux/sys-x86_64/registers.c	2006-05-07 18:11:44.000000000 -0400
+@@ -78,6 +78,12 @@
+ 		       HOST_FP_SIZE * sizeof(unsigned long));
+ }
+ 
++#ifndef JB_PC
++#define JB_PC 7
++#define JB_RSP 6
++#define JB_RBP 1
++#endif
++
+ void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer)
+ {
+ 	struct __jmp_buf_tag *jmpbuf = buffer;
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.16.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.16.ebuild
new file mode 100644
index 000000000000..0c01932609aa
--- /dev/null
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.16.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.16.ebuild,v 1.1 2006/05/08 02:35:26 dang Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="9"
+inherit kernel-2
+detect_version
+
+UML_VER="uml-2.6.16-bs2"
+UNIPATCH_LIST="${DISTDIR}/${UML_VER}.patch.bz2 
+	${FILESDIR}/${UML_VER}-new-glibc.patch"
+
+DESCRIPTION="Full sources for the User Mode Linux kernel"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
+	http://www.user-mode-linux.org/~blaisorblade/patches/guest/${UML_VER}/${UML_VER}.patch.bz2"
+HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
+KEYWORDS="~amd64 ~x86"
+
+K_EXTRAEINFO="Since you are using UML, you may want to read the Gentoo Linux
+Developer's guide to system testing with User-Mode Linux that
+can be found at http://www.gentoo.org/doc/en/uml.xml"
+