From c2d5fd1be28080fb1bd2f0c25313375c4b727835 Mon Sep 17 00:00:00 2001 From: ojab Date: Sun, 31 Mar 2013 12:10:40 +0400 Subject: [PATCH] kernel-uml: update to 3.8.5, add license --- srcpkgs/kernel-uml/patches/rlimit_fix.patch | 32 +++++++++++++++++++ srcpkgs/kernel-uml/patches/siginfo_fix.patch | 33 ++++++++++++++++++++ srcpkgs/kernel-uml/template | 8 ++--- 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/kernel-uml/patches/rlimit_fix.patch create mode 100644 srcpkgs/kernel-uml/patches/siginfo_fix.patch diff --git a/srcpkgs/kernel-uml/patches/rlimit_fix.patch b/srcpkgs/kernel-uml/patches/rlimit_fix.patch new file mode 100644 index 0000000000..574ccd7d3b --- /dev/null +++ b/srcpkgs/kernel-uml/patches/rlimit_fix.patch @@ -0,0 +1,32 @@ +commit fdfa4c952844fce881df8c76de9c7180cbe913ab +Author: Sergei Trofimovich +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 + CC: Jeff Dike + CC: Richard Weinberger + CC: Al Viro + 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 + +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 + #include + #include ++#include ++#include + #include + #include + #include diff --git a/srcpkgs/kernel-uml/patches/siginfo_fix.patch b/srcpkgs/kernel-uml/patches/siginfo_fix.patch new file mode 100644 index 0000000000..69fba1dc9c --- /dev/null +++ b/srcpkgs/kernel-uml/patches/siginfo_fix.patch @@ -0,0 +1,33 @@ +commit 72383d43b223c410fc61d9e905690b9b9ba9d418 +Author: Sergei Trofimovich +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 + CC: Jeff Dike + CC: Richard Weinberger + CC: "Martin Pärtel" + CC: Al Viro + 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 + +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 + #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, diff --git a/srcpkgs/kernel-uml/template b/srcpkgs/kernel-uml/template index add4226c9c..d9d03b7105 100644 --- a/srcpkgs/kernel-uml/template +++ b/srcpkgs/kernel-uml/template @@ -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