From c794111ef837bb86ccb0b271aaae8b892b6a9df5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 2 Oct 2006 16:19:57 +0000 Subject: linux-libc-headers-2.6.18: don't sanitize the secret kernel syscall macros away, util-linux wants them --- .../linux-libc-headers-2.6.18/.mtn2git_empty | 0 .../arm-syscall-define.patch | 22 ++++++++++++++++++++++ .../linux-libc-headers_2.6.18.bb | 5 +++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 packages/linux-libc-headers/linux-libc-headers-2.6.18/.mtn2git_empty create mode 100644 packages/linux-libc-headers/linux-libc-headers-2.6.18/arm-syscall-define.patch diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.18/.mtn2git_empty b/packages/linux-libc-headers/linux-libc-headers-2.6.18/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.18/arm-syscall-define.patch b/packages/linux-libc-headers/linux-libc-headers-2.6.18/arm-syscall-define.patch new file mode 100644 index 0000000000..ec5a87d2a3 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.18/arm-syscall-define.patch @@ -0,0 +1,22 @@ +# define the _syscall macros, needed to build util-linux + +Index: linux-2.6.18/include/asm-arm/unistd.h +=================================================================== +--- linux-2.6.18.orig/include/asm-arm/unistd.h 2006-10-02 18:05:31.000000000 +0200 ++++ linux-2.6.18/include/asm-arm/unistd.h 2006-10-02 18:05:47.000000000 +0200 +@@ -376,9 +376,6 @@ + #undef __NR_ipc + #endif + +-#ifdef __KERNEL__ +-#include +- + #define __sys2(x) #x + #define __sys1(x) __sys2(x) + +@@ -580,5 +577,4 @@ + */ + #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") + +-#endif /* __KERNEL__ */ + #endif /* __ASM_ARM_UNISTD_H */ diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb index 7074828a5f..ba2afc5346 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb @@ -4,9 +4,10 @@ LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "unifdef-native" -PR = "r0" +PR = "r1" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2" +SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ + file://arm-syscall-define.patch;patch=1" S = "${WORKDIR}/linux-2.6.18" -- cgit v1.2.3