diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2024-01-15 16:59:23 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-19 12:21:23 +0000 |
commit | 23311babb0dc922f2c20ce85b211136346085802 (patch) | |
tree | 0916c15d5b7c06552537587bb74f5932e7060cd9 /meta | |
parent | b9fee5ff9e53e21707383c7c70bd204b21c37520 (diff) | |
download | poky-23311babb0dc922f2c20ce85b211136346085802.tar.gz |
kexec-tools: upgrade 2.0.27 -> 2.0.28
0002-purgatory-Pass-r-directly-to-linker.patch
0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
0005-Disable-PIE-during-link.patch
refreshed for 2.0.28
(From OE-Core rev: ad748d0cf6ed87edcd33a13ed8aae11690d4d8ab)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0002-purgatory-Pass-r-directly-to-linker.patch | 7 | ||||
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch | 11 | ||||
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0005-Disable-PIE-during-link.patch | 7 | ||||
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb (renamed from meta/recipes-kernel/kexec/kexec-tools_2.0.27.bb) | 2 |
4 files changed, 15 insertions, 12 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0002-purgatory-Pass-r-directly-to-linker.patch b/meta/recipes-kernel/kexec/kexec-tools/0002-purgatory-Pass-r-directly-to-linker.patch index 363d5da4ae..a537ac2f0b 100644 --- a/meta/recipes-kernel/kexec/kexec-tools/0002-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 @@ | |||
1 | From a04bcf8f683c1a5a7d015920124457ad56fb7cf0 Mon Sep 17 00:00:00 2001 | 1 | From e5bc9fbd6029057a4e3815a5326af5bd83a450e6 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 7 Sep 2015 07:59:45 +0000 | 3 | Date: Mon, 7 Sep 2015 07:59:45 +0000 |
4 | Subject: [PATCH] purgatory: Pass -r directly to linker | 4 | Subject: [PATCH] purgatory: Pass -r directly to linker |
@@ -10,15 +10,16 @@ unfiltered | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | 11 | ||
12 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
13 | |||
13 | --- | 14 | --- |
14 | purgatory/Makefile | 2 +- | 15 | purgatory/Makefile | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 17 | ||
17 | diff --git a/purgatory/Makefile b/purgatory/Makefile | 18 | diff --git a/purgatory/Makefile b/purgatory/Makefile |
18 | index 2dd6c47..416e6b9 100644 | 19 | index 4d2d071..6673423 100644 |
19 | --- a/purgatory/Makefile | 20 | --- a/purgatory/Makefile |
20 | +++ b/purgatory/Makefile | 21 | +++ b/purgatory/Makefile |
21 | @@ -60,7 +60,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ | 22 | @@ -61,7 +61,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ |
22 | -I$(shell $(CC) -print-file-name=include) | 23 | -I$(shell $(CC) -print-file-name=include) |
23 | $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ | 24 | $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ |
24 | -Wl,--no-undefined -nostartfiles -nostdlib \ | 25 | -Wl,--no-undefined -nostartfiles -nostdlib \ |
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0003-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 832fe67716..e874a8b4f1 100644 --- a/meta/recipes-kernel/kexec/kexec-tools/0003-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 @@ | |||
1 | From 55e583d20651e829afbbc8dba0f8ec3017cda2d5 Mon Sep 17 00:00:00 2001 | 1 | From b62c1da8f8e641397add10367ee9c4cfdedb1cc0 Mon Sep 17 00:00:00 2001 |
2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | 2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> |
3 | Date: Mon, 9 Jan 2017 15:26:29 +0800 | 3 | Date: Mon, 9 Jan 2017 15:26:29 +0800 |
4 | Subject: [PATCH] kexec: ARM: Fix add_buffer_phys_virt() align issue | 4 | Subject: [PATCH] kexec: ARM: Fix add_buffer_phys_virt() align issue |
@@ -12,15 +12,16 @@ Upstream-Status: Pending | |||
12 | 12 | ||
13 | Suggested-By:fredrik.markstrom@gmail.com | 13 | Suggested-By:fredrik.markstrom@gmail.com |
14 | Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> | 14 | Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> |
15 | |||
15 | --- | 16 | --- |
16 | kexec/arch/arm/crashdump-arm.c | 5 ++++- | 17 | kexec/arch/arm/crashdump-arm.c | 5 ++++- |
17 | 1 file changed, 4 insertions(+), 1 deletion(-) | 18 | 1 file changed, 4 insertions(+), 1 deletion(-) |
18 | 19 | ||
19 | diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c | 20 | diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c |
20 | index daa4788..3f72b38 100644 | 21 | index 1ec1826..cc20f63 100644 |
21 | --- a/kexec/arch/arm/crashdump-arm.c | 22 | --- a/kexec/arch/arm/crashdump-arm.c |
22 | +++ b/kexec/arch/arm/crashdump-arm.c | 23 | +++ b/kexec/arch/arm/crashdump-arm.c |
23 | @@ -240,6 +240,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | 24 | @@ -242,6 +242,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) |
24 | void *buf; | 25 | void *buf; |
25 | int err; | 26 | int err; |
26 | int last_ranges; | 27 | int last_ranges; |
@@ -28,7 +29,7 @@ index daa4788..3f72b38 100644 | |||
28 | 29 | ||
29 | /* | 30 | /* |
30 | * First fetch all the memory (RAM) ranges that we are going to pass to | 31 | * First fetch all the memory (RAM) ranges that we are going to pass to |
31 | @@ -281,6 +282,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | 32 | @@ -283,6 +284,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) |
32 | 33 | ||
33 | /* for support LPAE enabled kernel*/ | 34 | /* for support LPAE enabled kernel*/ |
34 | elf_info.class = ELFCLASS64; | 35 | elf_info.class = ELFCLASS64; |
@@ -36,7 +37,7 @@ index daa4788..3f72b38 100644 | |||
36 | 37 | ||
37 | err = crash_create_elf64_headers(info, &elf_info, | 38 | err = crash_create_elf64_headers(info, &elf_info, |
38 | usablemem_rgns.ranges, | 39 | usablemem_rgns.ranges, |
39 | @@ -302,8 +304,9 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | 40 | @@ -304,8 +306,9 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) |
40 | * 1MB) so that available memory passed in kernel command line will be | 41 | * 1MB) so that available memory passed in kernel command line will be |
41 | * aligned to 1MB. This is because kernel create_mapping() wants memory | 42 | * aligned to 1MB. This is because kernel create_mapping() wants memory |
42 | * regions to be aligned to SECTION_SIZE. | 43 | * regions to be aligned to SECTION_SIZE. |
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0005-Disable-PIE-during-link.patch b/meta/recipes-kernel/kexec/kexec-tools/0005-Disable-PIE-during-link.patch index 7a4b8548ca..6a21744ac1 100644 --- a/meta/recipes-kernel/kexec/kexec-tools/0005-Disable-PIE-during-link.patch +++ b/meta/recipes-kernel/kexec/kexec-tools/0005-Disable-PIE-during-link.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c54488ad5fd657e0f154d76d7456d9080be24836 Mon Sep 17 00:00:00 2001 | 1 | From 494888bcc3bbf070dfce1b2686ee34c8619aa33d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 10 Jun 2017 11:18:49 -0700 | 3 | Date: Sat, 10 Jun 2017 11:18:49 -0700 |
4 | Subject: [PATCH] Disable PIE during link | 4 | Subject: [PATCH] Disable PIE during link |
@@ -9,15 +9,16 @@ just need to match it with linker flags | |||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
10 | 10 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | purgatory/Makefile | 2 +- | 14 | purgatory/Makefile | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 16 | ||
16 | diff --git a/purgatory/Makefile b/purgatory/Makefile | 17 | diff --git a/purgatory/Makefile b/purgatory/Makefile |
17 | index 416e6b9..f00edb4 100644 | 18 | index 6673423..a7405ea 100644 |
18 | --- a/purgatory/Makefile | 19 | --- a/purgatory/Makefile |
19 | +++ b/purgatory/Makefile | 20 | +++ b/purgatory/Makefile |
20 | @@ -59,7 +59,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ | 21 | @@ -60,7 +60,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ |
21 | -Iinclude \ | 22 | -Iinclude \ |
22 | -I$(shell $(CC) -print-file-name=include) | 23 | -I$(shell $(CC) -print-file-name=include) |
23 | $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ | 24 | $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ |
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.27.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb index 9b9864da9a..c2141e6716 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.27.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb | |||
@@ -19,7 +19,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz | |||
19 | file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ | 19 | file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI[sha256sum] = "410f89057d1f4cd2b0477b6c2035ec2c52e21c185e90742bbae8b4f78a7077a5" | 22 | SRC_URI[sha256sum] = "f33d2660b3e38d25a127e87097978e0f7a9a73ab5151a29eb80974d169ff6a29" |
23 | 23 | ||
24 | inherit autotools update-rc.d systemd | 24 | inherit autotools update-rc.d systemd |
25 | 25 | ||