summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-powerpc-change-the-memory-size-limit.patch (renamed from meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch)12
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0002-purgatory-Pass-r-directly-to-linker.patch (renamed from meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch)13
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch (renamed from meta/recipes-kernel/kexec/kexec-tools/0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch)7
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch (renamed from meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch)47
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0005-Disable-PIE-during-link.patch (renamed from meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch)7
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb18
6 files changed, 50 insertions, 54 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-powerpc-change-the-memory-size-limit.patch
index dc97d930e9..029650f35c 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-powerpc-change-the-memory-size-limit.patch
@@ -1,4 +1,4 @@
1From b19b68eab567aa534cf8dec79fe18e3dc0e14043 Mon Sep 17 00:00:00 2001 1From 211cae4b6a02a4d9d37bfcd76f3702696e095fc3 Mon Sep 17 00:00:00 2001
2From: Quanyang Wang <quanyang.wang@windriver.com> 2From: Quanyang Wang <quanyang.wang@windriver.com>
3Date: Tue, 16 Jun 2015 12:59:57 +0800 3Date: Tue, 16 Jun 2015 12:59:57 +0800
4Subject: [PATCH] powerpc: change the memory size limit 4Subject: [PATCH] powerpc: change the memory size limit
@@ -20,11 +20,11 @@ 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
23Index: kexec-tools-2.0.10/kexec/arch/ppc/kexec-ppc.h 23diff --git a/kexec/arch/ppc/kexec-ppc.h b/kexec/arch/ppc/kexec-ppc.h
24=================================================================== 24index 04e728e..6bae9ec 100644
25--- kexec-tools-2.0.10.orig/kexec/arch/ppc/kexec-ppc.h 25--- a/kexec/arch/ppc/kexec-ppc.h
26+++ kexec-tools-2.0.10/kexec/arch/ppc/kexec-ppc.h 26+++ b/kexec/arch/ppc/kexec-ppc.h
27@@ -42,7 +42,7 @@ void dol_ppc_usage(void); 27@@ -44,7 +44,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).
30 */ 30 */
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch b/meta/recipes-kernel/kexec/kexec-tools/0002-purgatory-Pass-r-directly-to-linker.patch
index bfd077daf0..363d5da4ae 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0002-purgatory-Pass-r-directly-to-linker.patch
@@ -1,4 +1,4 @@
1From a1135b3170963ba956f2364c1283864c35541295 Mon Sep 17 00:00:00 2001 1From a04bcf8f683c1a5a7d015920124457ad56fb7cf0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Sep 2015 07:59:45 +0000 3Date: Mon, 7 Sep 2015 07:59:45 +0000
4Subject: [PATCH] purgatory: Pass -r directly to linker 4Subject: [PATCH] purgatory: Pass -r directly to linker
@@ -8,17 +8,17 @@ where as gcc knows how to deal with it and passes it down to linker
8unfiltered 8unfiltered
9 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13 11
12Upstream-Status: Pending
13---
14 purgatory/Makefile | 2 +- 14 purgatory/Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/purgatory/Makefile b/purgatory/Makefile 17diff --git a/purgatory/Makefile b/purgatory/Makefile
18index 2b5c061..b251353 100644 18index 2dd6c47..416e6b9 100644
19--- a/purgatory/Makefile 19--- a/purgatory/Makefile
20+++ b/purgatory/Makefile 20+++ b/purgatory/Makefile
21@@ -61,7 +61,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ 21@@ -60,7 +60,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
22 -I$(shell $(CC) -print-file-name=include) 22 -I$(shell $(CC) -print-file-name=include)
23 $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ 23 $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
24 -Wl,--no-undefined -nostartfiles -nostdlib \ 24 -Wl,--no-undefined -nostartfiles -nostdlib \
@@ -27,6 +27,3 @@ index 2b5c061..b251353 100644
27 -Wl,-Map=$(PURGATORY_MAP) 27 -Wl,-Map=$(PURGATORY_MAP)
28 28
29 $(PURGATORY): $(PURGATORY_OBJS) 29 $(PURGATORY): $(PURGATORY_OBJS)
30--
312.5.1
32
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
index 6c6c66d885..832fe67716 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
@@ -1,4 +1,4 @@
1From 78e497fb69950665e639cfab8f4fb50cc404a1eb Mon Sep 17 00:00:00 2001 1From 55e583d20651e829afbbc8dba0f8ec3017cda2d5 Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com> 2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Mon, 9 Jan 2017 15:26:29 +0800 3Date: Mon, 9 Jan 2017 15:26:29 +0800
4Subject: [PATCH] kexec: ARM: Fix add_buffer_phys_virt() align issue 4Subject: [PATCH] kexec: ARM: Fix add_buffer_phys_virt() align issue
@@ -17,7 +17,7 @@ Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
17 1 file changed, 4 insertions(+), 1 deletion(-) 17 1 file changed, 4 insertions(+), 1 deletion(-)
18 18
19diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c 19diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c
20index 245c21a..12139c3 100644 20index daa4788..3f72b38 100644
21--- a/kexec/arch/arm/crashdump-arm.c 21--- a/kexec/arch/arm/crashdump-arm.c
22+++ b/kexec/arch/arm/crashdump-arm.c 22+++ b/kexec/arch/arm/crashdump-arm.c
23@@ -240,6 +240,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) 23@@ -240,6 +240,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)
@@ -47,6 +47,3 @@ index 245c21a..12139c3 100644
47 crash_kernel_mem.start, 47 crash_kernel_mem.start,
48 crash_kernel_mem.end, -1, 0); 48 crash_kernel_mem.end, -1, 0);
49 49
50--
511.9.1
52
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch b/meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch
index 26d18eb6fe..a809d5ba8e 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch
@@ -1,4 +1,10 @@
1x86_64: Add support to build kexec-tools with x32 ABI 1From 8c9a5076543eb3d497e016b3d7707e93d6311883 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Mon, 15 Jul 2013 23:32:36 -0700
4Subject: [PATCH] x86_64: Add support to build kexec-tools with x32 ABI
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
2 8
3Summary of changes, 9Summary of changes,
4 10
@@ -13,7 +19,6 @@ Upstream-Status: Submitted
13 19
14Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 20Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
15Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> 21Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
16
17--- 22---
18 configure.ac | 9 +++++++++ 23 configure.ac | 9 +++++++++
19 kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 4 ++++ 24 kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 4 ++++
@@ -21,11 +26,11 @@ Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
21 purgatory/arch/x86_64/Makefile | 4 +++- 26 purgatory/arch/x86_64/Makefile | 4 +++-
22 4 files changed, 20 insertions(+), 1 deletion(-) 27 4 files changed, 20 insertions(+), 1 deletion(-)
23 28
24Index: kexec-tools-2.0.10/configure.ac 29diff --git a/configure.ac b/configure.ac
25=================================================================== 30index c2b0c68..60882b8 100644
26--- kexec-tools-2.0.10.orig/configure.ac 31--- a/configure.ac
27+++ kexec-tools-2.0.10/configure.ac 32+++ b/configure.ac
28@@ -56,6 +56,15 @@ case $target_cpu in 33@@ -54,6 +54,15 @@ case $target_cpu in
29 ;; 34 ;;
30 ia64|x86_64|alpha|m68k ) 35 ia64|x86_64|alpha|m68k )
31 ARCH="$target_cpu" 36 ARCH="$target_cpu"
@@ -41,11 +46,11 @@ Index: kexec-tools-2.0.10/configure.ac
41 ;; 46 ;;
42 * ) 47 * )
43 AC_MSG_ERROR([unsupported architecture $target_cpu]) 48 AC_MSG_ERROR([unsupported architecture $target_cpu])
44Index: kexec-tools-2.0.10/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 49diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
45=================================================================== 50index db85b44..0ce1172 100644
46--- kexec-tools-2.0.10.orig/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 51--- a/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 52+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
48@@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_eh 53@@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr)
49 if (ehdr->ei_data != ELFDATA2LSB) { 54 if (ehdr->ei_data != ELFDATA2LSB) {
50 return 0; 55 return 0;
51 } 56 }
@@ -57,10 +62,10 @@ Index: kexec-tools-2.0.10/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
57 return 0; 62 return 0;
58 } 63 }
59 if (ehdr->e_machine != EM_X86_64) { 64 if (ehdr->e_machine != EM_X86_64) {
60Index: kexec-tools-2.0.10/kexec/kexec-syscall.h 65diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h
61=================================================================== 66index dac1c1f..e9479b7 100644
62--- kexec-tools-2.0.10.orig/kexec/kexec-syscall.h 67--- a/kexec/kexec-syscall.h
63+++ kexec-tools-2.0.10/kexec/kexec-syscall.h 68+++ b/kexec/kexec-syscall.h
64@@ -31,8 +31,12 @@ 69@@ -31,8 +31,12 @@
65 #define __NR_kexec_load 268 70 #define __NR_kexec_load 268
66 #endif 71 #endif
@@ -74,11 +79,11 @@ Index: kexec-tools-2.0.10/kexec/kexec-syscall.h
74 #ifdef __s390x__ 79 #ifdef __s390x__
75 #define __NR_kexec_load 277 80 #define __NR_kexec_load 277
76 #endif 81 #endif
77Index: kexec-tools-2.0.10/purgatory/arch/x86_64/Makefile 82diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile
78=================================================================== 83index 7300937..4af11e4 100644
79--- kexec-tools-2.0.10.orig/purgatory/arch/x86_64/Makefile 84--- a/purgatory/arch/x86_64/Makefile
80+++ kexec-tools-2.0.10/purgatory/arch/x86_64/Makefile 85+++ b/purgatory/arch/x86_64/Makefile
81@@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/ 86@@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c
82 x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c 87 x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c
83 x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c 88 x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c
84 89
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch b/meta/recipes-kernel/kexec/kexec-tools/0005-Disable-PIE-during-link.patch
index 3f2f85e337..7a4b8548ca 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0005-Disable-PIE-during-link.patch
@@ -1,4 +1,4 @@
1From ea7be6d71b85880e8e8a2c8a4f49a696c5f31ae4 Mon Sep 17 00:00:00 2001 1From c54488ad5fd657e0f154d76d7456d9080be24836 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 10 Jun 2017 11:18:49 -0700 3Date: Sat, 10 Jun 2017 11:18:49 -0700
4Subject: [PATCH] Disable PIE during link 4Subject: [PATCH] Disable PIE during link
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/purgatory/Makefile b/purgatory/Makefile 16diff --git a/purgatory/Makefile b/purgatory/Makefile
17index 564bdb7..a08e41f 100644 17index 416e6b9..f00edb4 100644
18--- a/purgatory/Makefile 18--- a/purgatory/Makefile
19+++ b/purgatory/Makefile 19+++ b/purgatory/Makefile
20@@ -59,7 +59,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ 20@@ -59,7 +59,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
@@ -26,6 +26,3 @@ index 564bdb7..a08e41f 100644
26 -nodefaultlibs -e purgatory_start -Wl,-r \ 26 -nodefaultlibs -e purgatory_start -Wl,-r \
27 -Wl,-Map=$(PURGATORY_MAP) 27 -Wl,-Map=$(PURGATORY_MAP)
28 28
29--
302.13.1
31
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb
index f65cd9f106..3439899070 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb
@@ -10,15 +10,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
10DEPENDS = "zlib xz" 10DEPENDS = "zlib xz"
11 11
12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \ 12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
13 file://kdump \ 13 file://kdump \
14 file://kdump.conf \ 14 file://kdump.conf \
15 file://kdump.service \ 15 file://kdump.service \
16 file://0002-powerpc-change-the-memory-size-limit.patch \ 16 file://0001-powerpc-change-the-memory-size-limit.patch \
17 file://0001-purgatory-Pass-r-directly-to-linker.patch \ 17 file://0002-purgatory-Pass-r-directly-to-linker.patch \
18 file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \ 18 file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
19 file://kexec-x32.patch \ 19 file://0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch \
20 file://0001-Disable-PIE-during-link.patch \ 20 file://0005-Disable-PIE-during-link.patch \
21 " 21"
22 22
23SRC_URI[md5sum] = "052458f0a35c2a3b0d2302caa3318e9f" 23SRC_URI[md5sum] = "052458f0a35c2a3b0d2302caa3318e9f"
24SRC_URI[sha256sum] = "913c8dee918e5855a4ba60d609371390978144b4c8d15d6446ca0057b7bc5e58" 24SRC_URI[sha256sum] = "913c8dee918e5855a4ba60d609371390978144b4c8d15d6446ca0057b7bc5e58"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 07:45:21 +0000