tags 489175 + patch
stop
Hi,
I'm not a porter myself, but prepared this porter NMU based on the
proposed changes; works for me on armel.
Cheers,
--
Loïc Minier
diff -u kexec-tools-20080324/debian/changelog
kexec-tools-20080324/debian/changelog
--- kexec-tools-20080324/debian/changelog
+++ kexec-tools-20080324/debian/changelog
@@ -1,3 +1,12 @@
+kexec-tools (20080324-2.1) unstable; urgency=low
+
+ * Porter NMU.
+ * New dpatch, arm_build, fixes build on armel; thanks Cyril Hrubis;
+ closes: #489175.
+ * List arm and armel in control.
+
+ -- Loic Minier <[email protected]> Sat, 31 Jan 2009 18:31:42 +0000
+
kexec-tools (20080324-2) unstable; urgency=low
* Updated init script to check for new boolean value of LOAD_KEXEC (closes:
diff -u kexec-tools-20080324/debian/control kexec-tools-20080324/debian/control
--- kexec-tools-20080324/debian/control
+++ kexec-tools-20080324/debian/control
@@ -6,7 +6,7 @@
Standards-Version: 3.7.3
Package: kexec-tools
-Architecture: i386 amd64 ppc64 powerpc ia64 s390
+Architecture: i386 amd64 ppc64 powerpc ia64 s390 arm armel
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf
Description: kexec tool for kexec reboots
This tool is used to load a kernel in memory and reboot into the kernel
diff -u kexec-tools-20080324/debian/patches/00list
kexec-tools-20080324/debian/patches/00list
--- kexec-tools-20080324/debian/patches/00list
+++ kexec-tools-20080324/debian/patches/00list
@@ -6,0 +7 @@
+arm_build.dpatch
only in patch2:
unchanged:
--- kexec-tools-20080324.orig/debian/patches/arm_build.dpatch
+++ kexec-tools-20080324/debian/patches/arm_build.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## arm_build.patch.dpatch by <l...@babbage>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes build on arm; see Debian #489175
+
+...@dpatch@
+diff -urNad kexec-tools-20080324~/kexec/arch/arm/kexec-zImage-arm.c
kexec-tools-20080324/kexec/arch/arm/kexec-zImage-arm.c
+--- kexec-tools-20080324~/kexec/arch/arm/kexec-zImage-arm.c 2008-03-21
03:13:12.000000000 +0000
++++ kexec-tools-20080324/kexec/arch/arm/kexec-zImage-arm.c 2009-01-31
18:30:31.000000000 +0000
+@@ -11,7 +11,7 @@
+ #include <stdint.h>
+ #include <getopt.h>
+ #include <arch/options.h>
+-#include <asm/page.h>
++#include <unistd.h>
+ #include "../../kexec.h"
+
+ #define COMMAND_LINE_SIZE 1024
