diff options
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch')
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch | 63 |
1 files changed, 19 insertions, 44 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch index 0bd3264af7..26d18eb6fe 100644 --- a/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch +++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch | |||
@@ -21,11 +21,11 @@ Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> | |||
21 | purgatory/arch/x86_64/Makefile | 4 +++- | 21 | purgatory/arch/x86_64/Makefile | 4 +++- |
22 | 4 files changed, 20 insertions(+), 1 deletion(-) | 22 | 4 files changed, 20 insertions(+), 1 deletion(-) |
23 | 23 | ||
24 | diff --git a/configure.ac b/configure.ac | 24 | Index: kexec-tools-2.0.10/configure.ac |
25 | index c410e90..1ecadd5 100644 | 25 | =================================================================== |
26 | --- a/configure.ac | 26 | --- kexec-tools-2.0.10.orig/configure.ac |
27 | +++ b/configure.ac | 27 | +++ kexec-tools-2.0.10/configure.ac |
28 | @@ -52,6 +52,15 @@ case $target_cpu in | 28 | @@ -56,6 +56,15 @@ case $target_cpu in |
29 | ;; | 29 | ;; |
30 | ia64|x86_64|alpha|m68k ) | 30 | ia64|x86_64|alpha|m68k ) |
31 | ARCH="$target_cpu" | 31 | ARCH="$target_cpu" |
@@ -41,11 +41,11 @@ index c410e90..1ecadd5 100644 | |||
41 | ;; | 41 | ;; |
42 | * ) | 42 | * ) |
43 | AC_MSG_ERROR([unsupported architecture $target_cpu]) | 43 | AC_MSG_ERROR([unsupported architecture $target_cpu]) |
44 | diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 44 | Index: kexec-tools-2.0.10/kexec/arch/x86_64/kexec-elf-rel-x86_64.c |
45 | index c795037..06db7f0 100644 | 45 | =================================================================== |
46 | --- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 46 | --- kexec-tools-2.0.10.orig/kexec/arch/x86_64/kexec-elf-rel-x86_64.c |
47 | +++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 47 | +++ kexec-tools-2.0.10/kexec/arch/x86_64/kexec-elf-rel-x86_64.c |
48 | @@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) | 48 | @@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_eh |
49 | if (ehdr->ei_data != ELFDATA2LSB) { | 49 | if (ehdr->ei_data != ELFDATA2LSB) { |
50 | return 0; | 50 | return 0; |
51 | } | 51 | } |
@@ -57,10 +57,10 @@ index c795037..06db7f0 100644 | |||
57 | return 0; | 57 | return 0; |
58 | } | 58 | } |
59 | if (ehdr->e_machine != EM_X86_64) { | 59 | if (ehdr->e_machine != EM_X86_64) { |
60 | diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h | 60 | Index: kexec-tools-2.0.10/kexec/kexec-syscall.h |
61 | index ce2e20b..cab5535 100644 | 61 | =================================================================== |
62 | --- a/kexec/kexec-syscall.h | 62 | --- kexec-tools-2.0.10.orig/kexec/kexec-syscall.h |
63 | +++ b/kexec/kexec-syscall.h | 63 | +++ kexec-tools-2.0.10/kexec/kexec-syscall.h |
64 | @@ -31,8 +31,12 @@ | 64 | @@ -31,8 +31,12 @@ |
65 | #define __NR_kexec_load 268 | 65 | #define __NR_kexec_load 268 |
66 | #endif | 66 | #endif |
@@ -74,11 +74,11 @@ index ce2e20b..cab5535 100644 | |||
74 | #ifdef __s390x__ | 74 | #ifdef __s390x__ |
75 | #define __NR_kexec_load 277 | 75 | #define __NR_kexec_load 277 |
76 | #endif | 76 | #endif |
77 | diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile | 77 | Index: kexec-tools-2.0.10/purgatory/arch/x86_64/Makefile |
78 | index 7300937..4af11e4 100644 | 78 | =================================================================== |
79 | --- a/purgatory/arch/x86_64/Makefile | 79 | --- kexec-tools-2.0.10.orig/purgatory/arch/x86_64/Makefile |
80 | +++ b/purgatory/arch/x86_64/Makefile | 80 | +++ kexec-tools-2.0.10/purgatory/arch/x86_64/Makefile |
81 | @@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c | 81 | @@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/ |
82 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c | 82 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c |
83 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c | 83 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c |
84 | 84 | ||
@@ -86,28 +86,3 @@ index 7300937..4af11e4 100644 | |||
86 | +ifeq ($(SUBARCH),64) | 86 | +ifeq ($(SUBARCH),64) |
87 | + x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large | 87 | + x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large |
88 | +endif | 88 | +endif |
89 | -- | ||
90 | 1.8.4.5 | ||
91 | |||
92 | diff --git a/configure.ac b/configure.ac | ||
93 | index 1ecadd5..e0b5f78 100644 | ||
94 | --- a/configure.ac | ||
95 | +++ b/configure.ac | ||
96 | @@ -8,6 +8,7 @@ AC_INIT(kexec-tools, 2.0.10.git) | ||
97 | AC_CONFIG_AUX_DIR(./config) | ||
98 | AC_CONFIG_HEADERS([include/config.h]) | ||
99 | AC_LANG(C) | ||
100 | +AC_PROG_CC | ||
101 | |||
102 | AC_DEFINE_UNQUOTED(PACKAGE_DATE, "`date '+%d %B %Y'`", | ||
103 | [Define to the release date of this package]) | ||
104 | @@ -106,9 +107,6 @@ AC_ARG_WITH([booke], | ||
105 | |||
106 | dnl ---Programs | ||
107 | dnl To specify a different compiler, just 'export CC=/path/to/compiler' | ||
108 | - | ||
109 | -AC_PROG_CC | ||
110 | - | ||
111 | if test "${build}" != "${host}" ; then | ||
112 | AC_CHECK_PROGS(BUILD_CC, [${build_alias}-gcc ${build}-gcc gcc]) | ||
113 | else | ||