diff --git a/kexec-tools.changes b/kexec-tools.changes index 8fffd0b..193ad63 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -26,6 +26,11 @@ Sun Dec 20 17:33:50 CET 2009 - bernhard@bwalle.de o kexec-tools-ppc64-dynamic-fix-3.diff o kexec-tools-ppc64-reinit.diff +------------------------------------------------------------------- +Mon Sep 21 13:20:37 UTC 2009 - jansimon.moeller@opensuse.org + +- fix build on arm. kexec-zImage-arm needed s#asm/page.h#unistd.h# + ------------------------------------------------------------------- Wed Aug 12 09:46:46 CEST 2009 - tiwai@suse.de diff --git a/kexec-tools.spec b/kexec-tools.spec index 5f8b71c..a1e863b 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -38,6 +38,7 @@ Source4: %{name}-%{version}-rpmlintrc Patch0: %{name}-no-vga-output.diff Patch1: %{name}-xen-static.diff Patch2: %{name}-increase-kernel-text-size.diff +Patch500: ARM_kexec-zImage-arm_page_to_unistd.diff Url: http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: fop @@ -71,6 +72,7 @@ Authors: %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch500 -p1 %build # disable as-needed diff --git a/project.diff b/project.diff deleted file mode 100644 index 9f592c7..0000000 --- a/project.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- kexec-tools.changes.orig -+++ kexec-tools.changes -@@ -1,4 +1,9 @@ - ------------------------------------------------------------------- -+Mon Sep 21 13:20:37 UTC 2009 - jansimon.moeller@opensuse.org -+ -+- fix build on arm. kexec-zImage-arm needed s#asm/page.h#unistd.h# -+ -+------------------------------------------------------------------- - Wed Aug 12 09:46:46 CEST 2009 - tiwai@suse.de - - - increase kernel text size to fix for 2.6.31 kernel (bnc#530240) ---- kexec-tools.spec.orig -+++ kexec-tools.spec -@@ -58,6 +58,7 @@ Patch19: %{name}-ppc64-dynamic-fi - Patch20: %{name}-ppc64-dynamic-fix-3.diff - Patch21: %{name}-ppc64-reinit.diff - Patch22: %{name}-increase-kernel-text-size.diff -+Patch500: ARM_kexec-zImage-arm_page_to_unistd.diff - Url: http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/ - BuildRoot: %{_tmppath}/%{name}-%{version}-build - #!BuildIgnore: fop -@@ -111,6 +112,7 @@ Authors: - %patch20 -p1 - %patch21 -p1 - %patch22 -p1 -+%patch500 -p1 - - %build - # disable as-needed