Bug#394055: Acknowledgement (linux-kernel-headers: build fix on m32r)
Hi,
I misunderstood the build error.
We should not include kernel headers in userspace.
Please replace the previous patch to the following one.
Thanks,
-- Takata
debian/patches/m32r-removed-unknown-isa.patch | 40 ++++++++++++++++++++++++++
debian/patches/series | 1
2 files changed, 41 insertions(+)
diff -ruNp linux-kernel-headers-2.6.18.org/debian/patches/m32r-removed-unknown-isa.patch linux-kernel-headers-2.6.18/debian/patches/m32r-removed-unknown-isa.patch
--- linux-kernel-headers-2.6.18.org/debian/patches/m32r-removed-unknown-isa.patch 1970-01-01 09:00:00.000000000 +0900
+++ linux-kernel-headers-2.6.18/debian/patches/m32r-removed-unknown-isa.patch 2006-10-19 22:16:35.000000000 +0900
@@ -0,0 +1,40 @@
+--- include/asm-m32r/ptrace.h.org 2006-10-19 21:49:31.000000000 +0900
++++ include/asm-m32r/ptrace.h 2006-10-19 21:50:02.000000000 +0900
+@@ -12,8 +12,6 @@
+ * Copyright (C) 2001-2002, 2004 Hirokazu Takata <takata at linux-m32r.org>
+ */
+
+-#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */
+-
+ /* 0 - 13 are integer registers (general purpose registers). */
+ #define PT_R4 0
+ #define PT_R5 1
+@@ -115,8 +113,6 @@ struct pt_regs {
+ unsigned long accl;
+ unsigned long dummy_acc1h;
+ unsigned long dummy_acc1l;
+-#else
+-#error unknown isa configuration
+ #endif
+ unsigned long psw;
+ unsigned long bpc; /* saved PC for TRAP syscalls */
+@@ -140,6 +136,8 @@ struct pt_regs {
+
+ #ifdef __KERNEL__
+
++#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */
++
+ #define __ARCH_SYS_PTRACE 1
+
+ #if defined(CONFIG_ISA_M32R2) || defined(CONFIG_CHIP_VDEC2)
+--- include/asm-m32r/sigcontext.h.org 2006-10-19 21:48:40.000000000 +0900
++++ include/asm-m32r/sigcontext.h 2006-10-19 21:48:54.000000000 +0900
+@@ -33,8 +33,6 @@ struct sigcontext {
+ unsigned long sc_accl;
+ unsigned long sc_dummy_acc1h;
+ unsigned long sc_dummy_acc1l;
+-#else
+-#error unknown isa configuration
+ #endif
+ unsigned long sc_psw;
+ unsigned long sc_bpc; /* saved PC for TRAP syscalls */
diff -ruNp linux-kernel-headers-2.6.18.org/debian/patches/series linux-kernel-headers-2.6.18/debian/patches/series
--- linux-kernel-headers-2.6.18.org/debian/patches/series 2006-10-19 21:44:51.000000000 +0900
+++ linux-kernel-headers-2.6.18/debian/patches/series 2006-10-19 22:16:35.000000000 +0900
@@ -36,3 +36,4 @@ asm-generic-bitops-fls64.patch
asm-generic-div64.patch
linux-ext2_fs.patch
linux-ixjuser.patch
+m32r-removed-unknown-isa.patch -p0
Reply to: