Update to bb2 and genpatches 8; fixes bug #154313, bug #155769, and bug #158792

(Portage version: 2.1.2_rc4-r4)

4 files changed, 106 insertions, 2 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 290f27d7ad12..528616f6f6ce 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.84 2006/09/30 21:10:10 dang Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.85 2007/01/03 03:59:08 dang Exp $
+
+*usermode-sources-2.6.18-r1 (03 Jan 2007)
+
+  03 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/uml-2.6.18-genpatches-8-prep.patch,
+  +usermode-sources-2.6.18-r1.ebuild:
+  Update to bb2 and genpatches 8; fixes bug #154313, bug #155769, and bug #158792
 
 *usermode-sources-2.6.18 (30 Sep 2006)
 
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.18-r1 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.18-r1
new file mode 100644
index 000000000000..4784d6488cf2
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.18-r1
@@ -0,0 +1,9 @@
+MD5 65e0ac78c740fd7e70cdd2fcab6d89ad genpatches-2.6.18-8.base.tar.bz2 108656
+RMD160 b0d604f8a1f476e34f6a3a4143e07a24dbcab6e8 genpatches-2.6.18-8.base.tar.bz2 108656
+SHA256 3ac24ea4b287429719de0b2828594e84eecbedb05f66300632363d3a60c185d0 genpatches-2.6.18-8.base.tar.bz2 108656
+MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
+RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
+SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
+MD5 683956ae680b9a09e5c5d7b99a568775 uml-2.6.18.1-bb2.patch.bz2 36108
+RMD160 8984ba75df2283764c916cebc38a4d05ee617996 uml-2.6.18.1-bb2.patch.bz2 36108
+SHA256 58366bd9a2129ed4486c37f9756a35a981a0e3d30a960da1278254777c6d8ac2 uml-2.6.18.1-bb2.patch.bz2 36108
diff --git a/sys-kernel/usermode-sources/files/uml-2.6.18-genpatches-8-prep.patch b/sys-kernel/usermode-sources/files/uml-2.6.18-genpatches-8-prep.patch
new file mode 100644
index 000000000000..19c6b139d5aa
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/uml-2.6.18-genpatches-8-prep.patch
@@ -0,0 +1,64 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/i386/Kconfig.cpu linux-2.6.18-usermode-r1/arch/i386/Kconfig.cpu
+--- linux-2.6.18-usermode-r1.orig/arch/i386/Kconfig.cpu	2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/i386/Kconfig.cpu	2007-01-02 21:54:14.000000000 -0500
+@@ -7,7 +7,6 @@ choice
+ 
+ config M386
+ 	bool "386"
+-	depends on !UML
+ 	---help---
+ 	  This is the processor type of your CPU. This information is used for
+ 	  optimizing purposes. In order to compile a kernel that can run on
+@@ -302,7 +301,7 @@ config X86_USE_PPRO_CHECKSUM
+ 
+ config X86_USE_3DNOW
+ 	bool
+-	depends on (MCYRIXIII || MK7 || MGEODE_LX) && !UML
++	depends on MCYRIXIII || MK7 || MGEODE_LX
+ 	default y
+ 
+ config X86_OOSTORE
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/include/kern_util.h linux-2.6.18-usermode-r1/arch/um/include/kern_util.h
+--- linux-2.6.18-usermode-r1.orig/arch/um/include/kern_util.h	2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/um/include/kern_util.h	2007-01-02 21:54:14.000000000 -0500
+@@ -6,6 +6,7 @@
+ #ifndef __KERN_UTIL_H__
+ #define __KERN_UTIL_H__
+ 
++#include "linux/threads.h"
+ #include "sysdep/ptrace.h"
+ #include "sysdep/faultinfo.h"
+ 
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/sys-i386/tls.c linux-2.6.18-usermode-r1/arch/um/os-Linux/sys-i386/tls.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/sys-i386/tls.c	2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/um/os-Linux/sys-i386/tls.c	2007-01-02 21:54:14.000000000 -0500
+@@ -1,6 +1,4 @@
+ #include <errno.h>
+-#include <sys/syscall.h>
+-#include <unistd.h>
+ #include <linux/unistd.h>
+ #include "sysdep/tls.h"
+ #include "user_util.h"
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/tls.c linux-2.6.18-usermode-r1/arch/um/os-Linux/tls.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/tls.c	2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/um/os-Linux/tls.c	2007-01-02 21:54:14.000000000 -0500
+@@ -1,8 +1,6 @@
+ #include <errno.h>
+ #include <sys/ptrace.h>
+-#include <sys/syscall.h>
+ #include <asm/ldt.h>
+-#include <unistd.h>
+ #include "sysdep/tls.h"
+ #include "uml-config.h"
+ 
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/sys-x86_64/stub_segv.c linux-2.6.18-usermode-r1/arch/um/sys-x86_64/stub_segv.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/sys-x86_64/stub_segv.c	2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/um/sys-x86_64/stub_segv.c	2007-01-02 21:54:14.000000000 -0500
+@@ -5,6 +5,7 @@
+ 
+ #include <stddef.h>
+ #include <signal.h>
++#include <linux/compiler.h>
+ #include <asm/unistd.h>
+ #include "uml-config.h"
+ #include "sysdep/sigcontext.h"
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.18-r1.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.18-r1.ebuild
new file mode 100644
index 000000000000..958c701b336c
--- /dev/null
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.18-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2007 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.18-r1.ebuild,v 1.1 2007/01/03 03:59:08 dang Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="8"
+inherit kernel-2
+detect_version
+
+UML_VER="uml-2.6.18.1-bb2"
+UNIPATCH_LIST="${FILESDIR}/uml-2.6.18-genpatches-8-prep.patch
+	${DISTDIR}/${UML_VER}.patch.bz2"
+UNIPATCH_STRICTORDER="yes"
+
+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"