summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Disabling-GCC-s-stack-protection.patch64
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch11
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch54
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch12
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch63
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb (renamed from meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb)5
6 files changed, 69 insertions, 140 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Disabling-GCC-s-stack-protection.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Disabling-GCC-s-stack-protection.patch
deleted file mode 100644
index 74a838704c..0000000000
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Disabling-GCC-s-stack-protection.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From 8227f5a583ad4523059ba2531263e625ac01cd40 Mon Sep 17 00:00:00 2001
2From: Kevin Hao <kexin.hao@windriver.com>
3Date: Tue, 28 Apr 2015 20:25:12 +0800
4Subject: [PATCH] purgatory: Disabling GCC's stack protection
5
6If the GCC's stack protection is enabled by default, the purgatory will
7also be built with this option. But it makes no sense to enable this
8for the purgatory code, and would cause error when we are trying to
9relocate the purgatory codes because symbol like __stack_chk_fail is
10unresolved. Instead of disabling this for some archs specifically,
11disable it for all the archs.
12
13Upstream-Status: Pending
14
15Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
16Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
17---
18 purgatory/Makefile | 3 ++-
19 purgatory/arch/ppc64/Makefile | 2 +-
20 purgatory/arch/s390/Makefile | 1 -
21 3 files changed, 3 insertions(+), 3 deletions(-)
22
23diff --git a/purgatory/Makefile b/purgatory/Makefile
24index 1945702..a25b262 100644
25--- a/purgatory/Makefile
26+++ b/purgatory/Makefile
27@@ -47,7 +47,8 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c
28 $(PURGATORY): CC=$(TARGET_CC)
29 $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \
30 $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
31- -Os -fno-builtin -ffreestanding
32+ -Os -fno-builtin -ffreestanding \
33+ -fno-stack-protector
34
35 $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
36 -I$(srcdir)/purgatory/include \
37diff --git a/purgatory/arch/ppc64/Makefile b/purgatory/arch/ppc64/Makefile
38index 6c58fa2..8ca2719 100644
39--- a/purgatory/arch/ppc64/Makefile
40+++ b/purgatory/arch/ppc64/Makefile
41@@ -9,7 +9,7 @@ ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/console-ppc64.c
42 ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/crashdump_backup.c
43 ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/misc.S
44
45-ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -msoft-float -fno-stack-protector \
46+ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -msoft-float \
47 -fno-exceptions
48 ppc64_PURGATORY_EXTRA_ASFLAGS += -m64
49 ifeq ($(SUBARCH),BE)
50diff --git a/purgatory/arch/s390/Makefile b/purgatory/arch/s390/Makefile
51index 09749bd..c94cc3c 100644
52--- a/purgatory/arch/s390/Makefile
53+++ b/purgatory/arch/s390/Makefile
54@@ -2,7 +2,6 @@
55 # Purgatory s390
56 #
57
58-s390_PURGATORY_EXTRA_CFLAGS += -fno-stack-protector
59 s390_PURGATORY_SRCS += purgatory/arch/s390/console-s390.c
60 s390_PURGATORY_SRCS += purgatory/arch/s390/setup-s390.S
61 s390_PURGATORY_SRCS += purgatory/arch/s390/purgatory-s390.c
62--
631.9.1
64
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch b/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
index d6b6383c70..dc97d930e9 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
@@ -20,10 +20,10 @@ Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
20 kexec/arch/ppc/kexec-ppc.h | 2 +- 20 kexec/arch/ppc/kexec-ppc.h | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-) 21 1 file changed, 1 insertion(+), 1 deletion(-)
22 22
23diff --git a/kexec/arch/ppc/kexec-ppc.h b/kexec/arch/ppc/kexec-ppc.h 23Index: kexec-tools-2.0.10/kexec/arch/ppc/kexec-ppc.h
24index 904cf48..a097ecd 100644 24===================================================================
25--- a/kexec/arch/ppc/kexec-ppc.h 25--- kexec-tools-2.0.10.orig/kexec/arch/ppc/kexec-ppc.h
26+++ b/kexec/arch/ppc/kexec-ppc.h 26+++ kexec-tools-2.0.10/kexec/arch/ppc/kexec-ppc.h
27@@ -42,7 +42,7 @@ void dol_ppc_usage(void); 27@@ -42,7 +42,7 @@ void dol_ppc_usage(void);
28 * During inital setup the kernel does not map the whole memory but a part of 28 * During inital setup the kernel does not map the whole memory but a part of
29 * it. On Book-E that is 64MiB, 601 24MiB or 256MiB (if possible). 29 * it. On Book-E that is 64MiB, 601 24MiB or 256MiB (if possible).
@@ -33,6 +33,3 @@ index 904cf48..a097ecd 100644
33 33
34 /* boot block version 17 as defined by the linux kernel */ 34 /* boot block version 17 as defined by the linux kernel */
35 struct bootblock { 35 struct bootblock {
36--
371.9.1
38
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch
index 92b5631f78..b03f582576 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch
@@ -29,9 +29,11 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
29 purgatory/arch/arm64/Makefile | 7 29 purgatory/arch/arm64/Makefile | 7
30 11 files changed, 675 insertions(+), 2 deletions(-) 30 11 files changed, 675 insertions(+), 2 deletions(-)
31 31
32--- a/configure.ac 32Index: kexec-tools-2.0.10/configure.ac
33+++ b/configure.ac 33===================================================================
34@@ -35,6 +35,9 @@ case $target_cpu in 34--- kexec-tools-2.0.10.orig/configure.ac
35+++ kexec-tools-2.0.10/configure.ac
36@@ -36,6 +36,9 @@ case $target_cpu in
35 ARCH="ppc64" 37 ARCH="ppc64"
36 SUBARCH="LE" 38 SUBARCH="LE"
37 ;; 39 ;;
@@ -41,8 +43,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
41 arm* ) 43 arm* )
42 ARCH="arm" 44 ARCH="arm"
43 ;; 45 ;;
44--- a/kexec/Makefile 46Index: kexec-tools-2.0.10/kexec/Makefile
45+++ b/kexec/Makefile 47===================================================================
48--- kexec-tools-2.0.10.orig/kexec/Makefile
49+++ kexec-tools-2.0.10/kexec/Makefile
46@@ -71,6 +71,7 @@ KEXEC_SRCS += $($(ARCH)_FS2DT) 50@@ -71,6 +71,7 @@ KEXEC_SRCS += $($(ARCH)_FS2DT)
47 51
48 include $(srcdir)/kexec/arch/alpha/Makefile 52 include $(srcdir)/kexec/arch/alpha/Makefile
@@ -51,8 +55,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
51 include $(srcdir)/kexec/arch/i386/Makefile 55 include $(srcdir)/kexec/arch/i386/Makefile
52 include $(srcdir)/kexec/arch/ia64/Makefile 56 include $(srcdir)/kexec/arch/ia64/Makefile
53 include $(srcdir)/kexec/arch/m68k/Makefile 57 include $(srcdir)/kexec/arch/m68k/Makefile
58Index: kexec-tools-2.0.10/kexec/arch/arm64/Makefile
59===================================================================
54--- /dev/null 60--- /dev/null
55+++ b/kexec/arch/arm64/Makefile 61+++ kexec-tools-2.0.10/kexec/arch/arm64/Makefile
56@@ -0,0 +1,13 @@ 62@@ -0,0 +1,13 @@
57+ 63+
58+arm64_KEXEC_SRCS += \ 64+arm64_KEXEC_SRCS += \
@@ -67,8 +73,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
67+dist += $(arm64_KEXEC_SRCS) \ 73+dist += $(arm64_KEXEC_SRCS) \
68+ kexec/arch/arm64/Makefile \ 74+ kexec/arch/arm64/Makefile \
69+ kexec/arch/arm64/kexec-arm64.h 75+ kexec/arch/arm64/kexec-arm64.h
76Index: kexec-tools-2.0.10/kexec/arch/arm64/crashdump-arm64.c
77===================================================================
70--- /dev/null 78--- /dev/null
71+++ b/kexec/arch/arm64/crashdump-arm64.c 79+++ kexec-tools-2.0.10/kexec/arch/arm64/crashdump-arm64.c
72@@ -0,0 +1,305 @@ 80@@ -0,0 +1,305 @@
73+/* 81+/*
74+ * This program is free software; you can redistribute it and/or modify 82+ * This program is free software; you can redistribute it and/or modify
@@ -375,8 +383,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
375+ 383+
376+#endif 384+#endif
377+ 385+
386Index: kexec-tools-2.0.10/kexec/arch/arm64/include/arch/options.h
387===================================================================
378--- /dev/null 388--- /dev/null
379+++ b/kexec/arch/arm64/include/arch/options.h 389+++ kexec-tools-2.0.10/kexec/arch/arm64/include/arch/options.h
380@@ -0,0 +1,26 @@ 390@@ -0,0 +1,26 @@
381+#ifndef KEXEC_ARCH_ARM64_OPTIONS_H 391+#ifndef KEXEC_ARCH_ARM64_OPTIONS_H
382+#define KEXEC_ARCH_ARM64_OPTIONS_H 392+#define KEXEC_ARCH_ARM64_OPTIONS_H
@@ -404,8 +414,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
404+#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR 414+#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR
405+ 415+
406+#endif /* KEXEC_ARCH_ARM64_OPTIONS_H */ 416+#endif /* KEXEC_ARCH_ARM64_OPTIONS_H */
417Index: kexec-tools-2.0.10/kexec/arch/arm64/kexec-arm64.c
418===================================================================
407--- /dev/null 419--- /dev/null
408+++ b/kexec/arch/arm64/kexec-arm64.c 420+++ kexec-tools-2.0.10/kexec/arch/arm64/kexec-arm64.c
409@@ -0,0 +1,177 @@ 421@@ -0,0 +1,177 @@
410+/* 422+/*
411+ * ARM64 kexec support. 423+ * ARM64 kexec support.
@@ -584,8 +596,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
584+ (void)value; 596+ (void)value;
585+ fprintf(stderr, "%s:%d: do\n", __func__, __LINE__); 597+ fprintf(stderr, "%s:%d: do\n", __func__, __LINE__);
586+} 598+}
599Index: kexec-tools-2.0.10/kexec/arch/arm64/kexec-arm64.h
600===================================================================
587--- /dev/null 601--- /dev/null
588+++ b/kexec/arch/arm64/kexec-arm64.h 602+++ kexec-tools-2.0.10/kexec/arch/arm64/kexec-arm64.h
589@@ -0,0 +1,20 @@ 603@@ -0,0 +1,20 @@
590+/* 604+/*
591+ * ARM64 kexec support. 605+ * ARM64 kexec support.
@@ -608,8 +622,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
608+ 622+
609+#endif 623+#endif
610\ No newline at end of file 624\ No newline at end of file
625Index: kexec-tools-2.0.10/kexec/arch/arm64/kexec-elf-arm64.c
626===================================================================
611--- /dev/null 627--- /dev/null
612+++ b/kexec/arch/arm64/kexec-elf-arm64.c 628+++ kexec-tools-2.0.10/kexec/arch/arm64/kexec-elf-arm64.c
613@@ -0,0 +1,114 @@ 629@@ -0,0 +1,114 @@
614+/* 630+/*
615+ * ARM64 kexec support. 631+ * ARM64 kexec support.
@@ -725,8 +741,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
725+ fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); 741+ fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__);
726+ fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); 742+ fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__);
727+} 743+}
728--- a/kexec/kexec-syscall.h 744Index: kexec-tools-2.0.10/kexec/kexec-syscall.h
729+++ b/kexec/kexec-syscall.h 745===================================================================
746--- kexec-tools-2.0.10.orig/kexec/kexec-syscall.h
747+++ kexec-tools-2.0.10/kexec/kexec-syscall.h
730@@ -39,8 +39,8 @@ 748@@ -39,8 +39,8 @@
731 #ifdef __s390__ 749 #ifdef __s390__
732 #define __NR_kexec_load 277 750 #define __NR_kexec_load 277
@@ -756,8 +774,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
756+#endif 774+#endif
757 775
758 #endif /* KEXEC_SYSCALL_H */ 776 #endif /* KEXEC_SYSCALL_H */
759--- a/kexec/kexec.c 777Index: kexec-tools-2.0.10/kexec/kexec.c
760+++ b/kexec/kexec.c 778===================================================================
779--- kexec-tools-2.0.10.orig/kexec/kexec.c
780+++ kexec-tools-2.0.10/kexec/kexec.c
761@@ -664,6 +664,8 @@ static int my_load(const char *type, int 781@@ -664,6 +664,8 @@ static int my_load(const char *type, int
762 memset(&info, 0, sizeof(info)); 782 memset(&info, 0, sizeof(info));
763 info.kexec_flags = kexec_flags; 783 info.kexec_flags = kexec_flags;
@@ -767,8 +787,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
767 result = 0; 787 result = 0;
768 if (argc - fileind <= 0) { 788 if (argc - fileind <= 0) {
769 fprintf(stderr, "No kernel specified\n"); 789 fprintf(stderr, "No kernel specified\n");
790Index: kexec-tools-2.0.10/purgatory/arch/arm64/Makefile
791===================================================================
770--- /dev/null 792--- /dev/null
771+++ b/purgatory/arch/arm64/Makefile 793+++ kexec-tools-2.0.10/purgatory/arch/arm64/Makefile
772@@ -0,0 +1,7 @@ 794@@ -0,0 +1,7 @@
773+# 795+#
774+# Purgatory arm64 796+# Purgatory arm64
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
index 8bb4fc49ad..e198eb6e9a 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
@@ -15,11 +15,11 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
15 kexec/fs2dt.c | 13 ++++++++++--- 15 kexec/fs2dt.c | 13 ++++++++++---
16 2 files changed, 20 insertions(+), 6 deletions(-) 16 2 files changed, 20 insertions(+), 6 deletions(-)
17 17
18diff --git a/kexec/arch/ppc/fs2dt.c b/kexec/arch/ppc/fs2dt.c 18Index: kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c
19index 4121c7d..cc04b04 100644 19===================================================================
20--- a/kexec/arch/ppc/fs2dt.c 20--- kexec-tools-2.0.10.orig/kexec/arch/ppc/fs2dt.c
21+++ b/kexec/arch/ppc/fs2dt.c 21+++ kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c
22@@ -296,6 +296,9 @@ static int comparefunc(const void *dentry1, const void *dentry2) 22@@ -296,6 +296,9 @@ static int comparefunc(const void *dentr
23 { 23 {
24 char *str1 = (*(struct dirent **)dentry1)->d_name; 24 char *str1 = (*(struct dirent **)dentry1)->d_name;
25 char *str2 = (*(struct dirent **)dentry2)->d_name; 25 char *str2 = (*(struct dirent **)dentry2)->d_name;
@@ -29,7 +29,7 @@ index 4121c7d..cc04b04 100644
29 29
30 /* 30 /*
31 * strcmp scans from left to right and fails to idetify for some 31 * strcmp scans from left to right and fails to idetify for some
32@@ -303,9 +306,13 @@ static int comparefunc(const void *dentry1, const void *dentry2) 32@@ -303,9 +306,13 @@ static int comparefunc(const void *dentr
33 * Therefore, we get the wrong sorted order like memory@10000000 and 33 * Therefore, we get the wrong sorted order like memory@10000000 and
34 * memory@f000000. 34 * memory@f000000.
35 */ 35 */
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
24diff --git a/configure.ac b/configure.ac 24Index: kexec-tools-2.0.10/configure.ac
25index 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])
44diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 44Index: kexec-tools-2.0.10/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
45index 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) {
60diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h 60Index: kexec-tools-2.0.10/kexec/kexec-syscall.h
61index 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
77diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile 77Index: kexec-tools-2.0.10/purgatory/arch/x86_64/Makefile
78index 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--
901.8.4.5
91
92diff --git a/configure.ac b/configure.ac
93index 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
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb
index 6164ff507a..dd7bba7031 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb
@@ -5,12 +5,11 @@ EXTRA_OECONF = " --with-zlib=yes"
5SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \ 5SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \
6 file://kexec-aarch64.patch \ 6 file://kexec-aarch64.patch \
7 file://kexec-x32.patch \ 7 file://kexec-x32.patch \
8 file://0001-purgatory-Disabling-GCC-s-stack-protection.patch \
9 file://0002-powerpc-change-the-memory-size-limit.patch \ 8 file://0002-powerpc-change-the-memory-size-limit.patch \
10 " 9 "
11 10
12SRC_URI[md5sum] = "4ecb7ab7ad9eb6ce413899bdb07a8426" 11SRC_URI[md5sum] = "6cb4d22bcec71b6e070aa8e9d990a5e6"
13SRC_URI[sha256sum] = "c2c6d204fe0911ebd304c40100163237feca4c5a854a2cca382ee36916a573d8" 12SRC_URI[sha256sum] = "c31bb83deef9547a28e8cfc1f0916e70f8e6b92a6bd2ef7077e12e3338239af3"
14 13
15PACKAGES =+ "kexec kdump vmcore-dmesg" 14PACKAGES =+ "kexec kdump vmcore-dmesg"
16 15
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-28 20:32:45 +0000