kernel-uml: update to 3.8.5, add license

This commit is contained in:
ojab 2013-03-31 12:10:40 +04:00
parent 5a5db9c35d
commit c2d5fd1be2
3 changed files with 69 additions and 4 deletions

View file

@ -0,0 +1,32 @@
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>

View file

@ -0,0 +1,33 @@
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,

View file

@ -1,11 +1,11 @@
# Build template for 'kernel-uml'.
#
# Build template for 'kernel-uml'
pkgname=kernel-uml
version=3.2.6
version=3.8.5
wrksrc=linux-${version}
homepage="http://www.kernel.org"
license="GPL-2"
distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
checksum=9db97d45638017e6dfaed768cfa9f47533c9c9fb3538bce0e594d9feff5489b4
checksum=1f1b6e09cb6ba656b28a41eb9e16e11576879f14574c0cb861b24734f3c5899f
makedepends="perl>=0 libpcap-devel"
fulldepends="uml-utilities"
revision=1