kernel-uml: update to 3.10.30.

srcpkgs/kernel-uml/patches/rlimit_fix.patch

@@ -1,32 +0,0 @@
-commit fdfa4c952844fce881df8c76de9c7180cbe913ab
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Sun Dec 30 01:37:30 2012 +0300
-
-    um: add missing declaration of 'getrlimit()' and friends
-    
-    arch/um/os-Linux/start_up.c: In function 'check_coredump_limit':
-    arch/um/os-Linux/start_up.c:338:16: error: storage size of 'lim' isn't known
-    arch/um/os-Linux/start_up.c:339:2: error: implicit declaration of function 'getrlimit' [-Werror=implicit-function-declaration]
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-    CC: Jeff Dike <jdike@addtoit.com>
-    CC: Richard Weinberger <richard@nod.at>
-    CC: Al Viro <viro@zeniv.linux.org.uk>
-    CC: user-mode-linux-devel@lists.sourceforge.net
-    CC: user-mode-linux-user@lists.sourceforge.net
-    CC: linux-kernel@vger.kernel.org
-    Signed-off-by: Richard Weinberger <richard@nod.at>
-
-diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
-index da4b9e9..337518c 100644
---- arch/um/os-Linux/start_up.c
-+++ arch/um/os-Linux/start_up.c
-@@ -15,6 +15,8 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include <asm/unistd.h>
- #include <init.h>
- #include <os.h>

srcpkgs/kernel-uml/patches/siginfo_fix.patch

@@ -1,33 +0,0 @@
-commit 72383d43b223c410fc61d9e905690b9b9ba9d418
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Sun Dec 30 01:37:31 2012 +0300
-
-    um: fix build failure due to mess-up of sig_info protorype
-    
-    arch/um/os-Linux/signal.c:18:8: error: conflicting types for 'sig_info'
-    In file included from /home/slyfox/linux-2.6/arch/um/os-Linux/signal.c:12:0:
-    arch/um/include/shared/as-layout.h:64:15: note: previous declaration of 'sig_info' was here
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-    CC: Jeff Dike <jdike@addtoit.com>
-    CC: Richard Weinberger <richard@nod.at>
-    CC: "Martin Pärtel" <martin.partel@gmail.com>
-    CC: Al Viro <viro@zeniv.linux.org.uk>
-    CC: user-mode-linux-devel@lists.sourceforge.net
-    CC: user-mode-linux-user@lists.sourceforge.net
-    CC: linux-kernel@vger.kernel.org
-    Signed-off-by: Richard Weinberger <richard@nod.at>
-
-diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
-index b1469fe..9d9f1b4 100644
---- arch/um/os-Linux/signal.c
-+++ arch/um/os-Linux/signal.c
-@@ -15,7 +15,7 @@
- #include <sysdep/mcontext.h>
- #include "internal.h"
- 
--void (*sig_info[NSIG])(int, siginfo_t *, struct uml_pt_regs *) = {
-+void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
- 	[SIGTRAP]	= relay_signal,
- 	[SIGFPE]	= relay_signal,
- 	[SIGILL]	= relay_signal,

srcpkgs/kernel-uml/template

@@ -1,26 +1,36 @@
 # Build template for 'kernel-uml'
 pkgname=kernel-uml
-version=3.8.5
+version=3.10.30
 revision=1
 wrksrc=linux-${version}
-makedepends="perl libpcap-devel uml-utilities"
+hostmakedepends="perl bc"
+makedepends="libpcap-devel uml-utilities"
 depends="uml-utilities"
 homepage="http://www.kernel.org"
 license="GPL-2"
 short_desc="Kernel ${version} for User Mode Linux"
 distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
-checksum=1f1b6e09cb6ba656b28a41eb9e16e11576879f14574c0cb861b24734f3c5899f
+checksum=150a05c96f9f00337d9bf14de0dfff4efe395c9b7776c189f1fb1901de113d29
-long_desc="
- User-mode Linux (UML) is a port of the Linux kernel to its own system call
- interface. It provides a kind of virtual machine, which runs Linux as a user
- process under another Linux kernel. This is useful for kernel development,
- sandboxes, jails, experimentation, and many other things.
 
- This package contains the kernel itself, as an executable program, and the
+case "$XBPS_TARGET_MACHINE" in
- associated kernel modules."
+	i686*) _subarch="x86";;
+	x86_64*) _subarch="x86_64";;
+	*) msg_error "${pkgname}-${version} cannot be built for ${XBPS_TARGET_MACHINE}.\n";;
+esac
+
+do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	make ${_args} ARCH=um SUBARCH=${_subarch} defconfig
+}
 
 do_build() {
-	make LDFLAGS= ARCH=um defconfig && make LDFLAGS= ARCH=um ${makejobs}
+	unset LDFLAGS
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	make ${_args} ARCH=um SUBARCH=${_subarch} ${makejobs}
 }
 
 do_install() {