diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-07-21 00:45:40 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-07-21 09:40:20 -0700 |
commit | 4ee778798df2e30362f9138c8988d343a963ab2b (patch) | |
tree | 20d53aa5e91c387a477018e7d1e27522958a149c /meta-initramfs | |
parent | b44a72a07e13862896e05169faeaebadf671779b (diff) | |
download | meta-openembedded-4ee778798df2e30362f9138c8988d343a963ab2b.tar.gz |
kexec-tools-klibc: Refresh patch with no code change
Fixes
kexec-tools-klibc-2.0.18+gitAUTOINC+5750980cdb: Patch log indicates that patches do not apply cleanly. [patch-fuzz]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs')
29 files changed, 110 insertions, 123 deletions
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0001-force-static-build.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0001-force-static-build.patch index 4744e7a35..34826baed 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0001-force-static-build.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0001-force-static-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d6af515cfcc8185f423860f80ff28719975b701f Mon Sep 17 00:00:00 2001 | 1 | From 2a62d7623e3d4c0eaa44434ab678274fe3a9edb1 Mon Sep 17 00:00:00 2001 |
2 | From: OpenEmbedded <oe.patch@oe> | 2 | From: OpenEmbedded <oe.patch@oe> |
3 | Date: Wed, 11 Apr 2018 22:51:00 +0200 | 3 | Date: Wed, 11 Apr 2018 22:51:00 +0200 |
4 | Subject: [PATCH] force static build | 4 | Subject: [PATCH] force static build |
@@ -11,7 +11,7 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/Makefile.in b/Makefile.in | 13 | diff --git a/Makefile.in b/Makefile.in |
14 | index 54c206f..79188d8 100644 | 14 | index fb01134..dbf1fb6 100644 |
15 | --- a/Makefile.in | 15 | --- a/Makefile.in |
16 | +++ b/Makefile.in | 16 | +++ b/Makefile.in |
17 | @@ -47,7 +47,7 @@ TARGET_CFLAGS = @TARGET_CFLAGS@ | 17 | @@ -47,7 +47,7 @@ TARGET_CFLAGS = @TARGET_CFLAGS@ |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch index 1d96a2b3d..ec456f382 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0976d2d5be1ed44c2324b609c7d16c1e93181c4b Mon Sep 17 00:00:00 2001 | 1 | From 6843cefb1d1d0017a714a2752bb008efd844f3e4 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: Thu, 13 Jul 2017 16:20:08 -0700 | 3 | Date: Thu, 13 Jul 2017 16:20:08 -0700 |
4 | Subject: [PATCH] Adjust the order of headers to fix build for musl | 4 | Subject: [PATCH] Adjust the order of headers to fix build for musl |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0003-kexec-elf-rel-use-our-elf.h.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0003-kexec-elf-rel-use-our-elf.h.patch index ae9e7bbc4..32035ca12 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0003-kexec-elf-rel-use-our-elf.h.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0003-kexec-elf-rel-use-our-elf.h.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7f91875d65778154709e4fa0ccb23f3b2a98b0dc Mon Sep 17 00:00:00 2001 | 1 | From 7e202ea55e8dd803278d9d1eac7ffd355344d6be Mon Sep 17 00:00:00 2001 |
2 | From: OpenEmbedded <oe.patch@oe> | 2 | From: OpenEmbedded <oe.patch@oe> |
3 | Date: Wed, 11 Apr 2018 22:51:00 +0200 | 3 | Date: Wed, 11 Apr 2018 22:51:00 +0200 |
4 | Subject: [PATCH] kexec-elf-rel: use our elf.h | 4 | Subject: [PATCH] kexec-elf-rel: use our elf.h |
@@ -56,7 +56,7 @@ index 1acbd86..a60c66c 100644 | |||
56 | #include "../../kexec-elf.h" | 56 | #include "../../kexec-elf.h" |
57 | 57 | ||
58 | diff --git a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 58 | diff --git a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c |
59 | index 5f8e3f2..765bf6e 100644 | 59 | index 51b1354..c85f421 100644 |
60 | --- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 60 | --- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c |
61 | +++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 61 | +++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c |
62 | @@ -1,5 +1,5 @@ | 62 | @@ -1,5 +1,5 @@ |
@@ -67,7 +67,7 @@ index 5f8e3f2..765bf6e 100644 | |||
67 | #include "../../kexec.h" | 67 | #include "../../kexec.h" |
68 | #include "../../kexec-elf.h" | 68 | #include "../../kexec-elf.h" |
69 | diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 69 | diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c |
70 | index 7fdde73..cd5d729 100644 | 70 | index db85b44..761a4ed 100644 |
71 | --- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 71 | --- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c |
72 | +++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 72 | +++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c |
73 | @@ -1,5 +1,5 @@ | 73 | @@ -1,5 +1,5 @@ |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0004-kexec-elf-exec.c-replace-with-our-err.h.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0004-kexec-elf-exec.c-replace-with-our-err.h.patch index 1080e8bb5..27a1cc7a5 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0004-kexec-elf-exec.c-replace-with-our-err.h.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0004-kexec-elf-exec.c-replace-with-our-err.h.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8b9da93ac9a4ea79ae953f80f6fe6e4f080341f2 Mon Sep 17 00:00:00 2001 | 1 | From 720e24029fca7dcd8e1cd0b556f37aa1dc2b8fe8 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Tue, 17 Apr 2018 10:57:23 +0200 | 3 | Date: Tue, 17 Apr 2018 10:57:23 +0200 |
4 | Subject: [PATCH] kexec-elf-exec.c: replace with our elf.h | 4 | Subject: [PATCH] kexec-elf-exec.c: replace with our elf.h |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0005-crashdump-elf.c-work-around-for-sysconf-_SC_NPROCESS.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0005-crashdump-elf.c-work-around-for-sysconf-_SC_NPROCESS.patch index 4f7506d44..4604c2a5b 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0005-crashdump-elf.c-work-around-for-sysconf-_SC_NPROCESS.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0005-crashdump-elf.c-work-around-for-sysconf-_SC_NPROCESS.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1cfee75d9662c3382bb7cb8f1c952333837598ae Mon Sep 17 00:00:00 2001 | 1 | From 43fb9cec1749b337bfa252fc2c1b0288847e8fa7 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Wed, 18 Apr 2018 02:21:30 +0200 | 3 | Date: Wed, 18 Apr 2018 02:21:30 +0200 |
4 | Subject: [PATCH] crashdump-elf.c: work around for _SC_NPROCESSORS_CONF | 4 | Subject: [PATCH] crashdump-elf.c: work around for _SC_NPROCESSORS_CONF |
@@ -18,7 +18,7 @@ Upstream-Status: Inappropriate [klibc specific] | |||
18 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 18 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
19 | 19 | ||
20 | --- | 20 | --- |
21 | kexec/crashdump-elf.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ | 21 | kexec/crashdump-elf.c | 92 +++++++++++++++++++++++++++++++++++++++++++ |
22 | 1 file changed, 92 insertions(+) | 22 | 1 file changed, 92 insertions(+) |
23 | 23 | ||
24 | diff --git a/kexec/crashdump-elf.c b/kexec/crashdump-elf.c | 24 | diff --git a/kexec/crashdump-elf.c b/kexec/crashdump-elf.c |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch index 3020f767a..a607ce777 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 45a80fe7d247898d83edfeabe32b9de80a50a6be Mon Sep 17 00:00:00 2001 | 1 | From ab24f236cbc0aa8a3eadde5d71d9d7ea1d979a51 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Fri, 31 Aug 2018 11:33:51 +0200 | 3 | Date: Fri, 31 Aug 2018 11:33:51 +0200 |
4 | Subject: [PATCH] kexec-syscall.h: work around missing syscall() wrapper | 4 | Subject: [PATCH] kexec-syscall.h: work around missing syscall() wrapper |
@@ -16,10 +16,10 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
16 | 1 file changed, 21 insertions(+) | 16 | 1 file changed, 21 insertions(+) |
17 | 17 | ||
18 | diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h | 18 | diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h |
19 | index 33638c2..204007d 100644 | 19 | index b96e02a..2a3794d 100644 |
20 | --- a/kexec/kexec-syscall.h | 20 | --- a/kexec/kexec-syscall.h |
21 | +++ b/kexec/kexec-syscall.h | 21 | +++ b/kexec/kexec-syscall.h |
22 | @@ -74,11 +74,16 @@ | 22 | @@ -77,11 +77,16 @@ |
23 | 23 | ||
24 | struct kexec_segment; | 24 | struct kexec_segment; |
25 | 25 | ||
@@ -36,7 +36,7 @@ index 33638c2..204007d 100644 | |||
36 | 36 | ||
37 | static inline int is_kexec_file_load_implemented(void) { | 37 | static inline int is_kexec_file_load_implemented(void) { |
38 | if (__NR_kexec_file_load != 0xffffffff) | 38 | if (__NR_kexec_file_load != 0xffffffff) |
39 | @@ -86,6 +91,21 @@ static inline int is_kexec_file_load_implemented(void) { | 39 | @@ -89,6 +94,21 @@ static inline int is_kexec_file_load_implemented(void) { |
40 | return 0; | 40 | return 0; |
41 | } | 41 | } |
42 | 42 | ||
@@ -58,7 +58,7 @@ index 33638c2..204007d 100644 | |||
58 | static inline long kexec_file_load(int kernel_fd, int initrd_fd, | 58 | static inline long kexec_file_load(int kernel_fd, int initrd_fd, |
59 | unsigned long cmdline_len, const char *cmdline_ptr, | 59 | unsigned long cmdline_len, const char *cmdline_ptr, |
60 | unsigned long flags) | 60 | unsigned long flags) |
61 | @@ -93,6 +113,7 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd, | 61 | @@ -96,6 +116,7 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd, |
62 | return (long) syscall(__NR_kexec_file_load, kernel_fd, initrd_fd, | 62 | return (long) syscall(__NR_kexec_file_load, kernel_fd, initrd_fd, |
63 | cmdline_len, cmdline_ptr, flags); | 63 | cmdline_len, cmdline_ptr, flags); |
64 | } | 64 | } |
@@ -66,6 +66,3 @@ index 33638c2..204007d 100644 | |||
66 | 66 | ||
67 | #define KEXEC_ON_CRASH 0x00000001 | 67 | #define KEXEC_ON_CRASH 0x00000001 |
68 | #define KEXEC_PRESERVE_CONTEXT 0x00000002 | 68 | #define KEXEC_PRESERVE_CONTEXT 0x00000002 |
69 | -- | ||
70 | 2.7.4 | ||
71 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0007-kexec.c-add-guard-around-ENOTSUP.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0007-kexec.c-add-guard-around-ENOTSUP.patch index 3d4468393..0ae90016d 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0007-kexec.c-add-guard-around-ENOTSUP.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0007-kexec.c-add-guard-around-ENOTSUP.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e6bd7a1bcfbd3e54efc81fbd7d60d915f9af0632 Mon Sep 17 00:00:00 2001 | 1 | From 17e9da8d3c3c69f84e11c0457bd9fb8c4ee4274b Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Tue, 17 Apr 2018 11:35:14 +0200 | 3 | Date: Tue, 17 Apr 2018 11:35:14 +0200 |
4 | Subject: [PATCH] kexec.c: add guard around ENOTSUP | 4 | Subject: [PATCH] kexec.c: add guard around ENOTSUP |
@@ -16,10 +16,10 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
16 | 1 file changed, 2 insertions(+) | 16 | 1 file changed, 2 insertions(+) |
17 | 17 | ||
18 | diff --git a/kexec/kexec.c b/kexec/kexec.c | 18 | diff --git a/kexec/kexec.c b/kexec/kexec.c |
19 | index 313d9fe..b5a8a1e 100644 | 19 | index 32ae56c..0764e85 100644 |
20 | --- a/kexec/kexec.c | 20 | --- a/kexec/kexec.c |
21 | +++ b/kexec/kexec.c | 21 | +++ b/kexec/kexec.c |
22 | @@ -1501,6 +1501,7 @@ int main(int argc, char *argv[]) | 22 | @@ -1517,6 +1517,7 @@ int main(int argc, char *argv[]) |
23 | */ | 23 | */ |
24 | case -EINVAL: | 24 | case -EINVAL: |
25 | case -ENOEXEC: | 25 | case -ENOEXEC: |
@@ -27,7 +27,7 @@ index 313d9fe..b5a8a1e 100644 | |||
27 | /* | 27 | /* |
28 | * ENOTSUP can be unsupported image | 28 | * ENOTSUP can be unsupported image |
29 | * type or unsupported PE signature | 29 | * type or unsupported PE signature |
30 | @@ -1513,6 +1514,7 @@ int main(int argc, char *argv[]) | 30 | @@ -1529,6 +1530,7 @@ int main(int argc, char *argv[]) |
31 | * kernel bug | 31 | * kernel bug |
32 | */ | 32 | */ |
33 | case -ENOTSUP: | 33 | case -ENOTSUP: |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0008-kexec.c-replace-mising-BLKGETSIZE64.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0008-kexec.c-replace-mising-BLKGETSIZE64.patch index cfc51cf7f..0ab7a1d71 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0008-kexec.c-replace-mising-BLKGETSIZE64.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0008-kexec.c-replace-mising-BLKGETSIZE64.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 12c7b09c3152f2b3475d081691a26bd1a5633256 Mon Sep 17 00:00:00 2001 | 1 | From 30b61da180286643bea68b09b092744346011801 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Tue, 17 Apr 2018 11:38:42 +0200 | 3 | Date: Tue, 17 Apr 2018 11:38:42 +0200 |
4 | Subject: [PATCH] kexec.c: replace missing BLKGETSIZE64 | 4 | Subject: [PATCH] kexec.c: replace missing BLKGETSIZE64 |
@@ -16,10 +16,10 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
16 | 1 file changed, 4 insertions(+) | 16 | 1 file changed, 4 insertions(+) |
17 | 17 | ||
18 | diff --git a/kexec/kexec.c b/kexec/kexec.c | 18 | diff --git a/kexec/kexec.c b/kexec/kexec.c |
19 | index b5a8a1e..7842f8b 100644 | 19 | index 0764e85..157c577 100644 |
20 | --- a/kexec/kexec.c | 20 | --- a/kexec/kexec.c |
21 | +++ b/kexec/kexec.c | 21 | +++ b/kexec/kexec.c |
22 | @@ -54,6 +54,10 @@ | 22 | @@ -55,6 +55,10 @@ |
23 | #define KEXEC_LOADED_PATH "/sys/kernel/kexec_loaded" | 23 | #define KEXEC_LOADED_PATH "/sys/kernel/kexec_loaded" |
24 | #define KEXEC_CRASH_LOADED_PATH "/sys/kernel/kexec_crash_loaded" | 24 | #define KEXEC_CRASH_LOADED_PATH "/sys/kernel/kexec_crash_loaded" |
25 | 25 | ||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0009-vmcore-dmesg.c-work-around-missing-imaxdiv.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0009-vmcore-dmesg.c-work-around-missing-imaxdiv.patch index df980b118..8bc473cb0 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0009-vmcore-dmesg.c-work-around-missing-imaxdiv.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0009-vmcore-dmesg.c-work-around-missing-imaxdiv.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ad598a71ffff6f86462211f252ac0c7b5de53869 Mon Sep 17 00:00:00 2001 | 1 | From 20e2c61fc04a291250acee649c2523d2546cedea Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Tue, 17 Apr 2018 13:14:12 +0200 | 3 | Date: Tue, 17 Apr 2018 13:14:12 +0200 |
4 | Subject: [PATCH] vmcore-dmesg.c: work around missing imaxdiv() | 4 | Subject: [PATCH] vmcore-dmesg.c: work around missing imaxdiv() |
@@ -18,7 +18,7 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
18 | 1 file changed, 12 insertions(+), 1 deletion(-) | 18 | 1 file changed, 12 insertions(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c | 20 | diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c |
21 | index e340ef4..1b27b71 100644 | 21 | index 7972788..c63ac4f 100644 |
22 | --- a/vmcore-dmesg/vmcore-dmesg.c | 22 | --- a/vmcore-dmesg/vmcore-dmesg.c |
23 | +++ b/vmcore-dmesg/vmcore-dmesg.c | 23 | +++ b/vmcore-dmesg/vmcore-dmesg.c |
24 | @@ -575,8 +575,11 @@ static void dump_dmesg_structured(int fd) | 24 | @@ -575,8 +575,11 @@ static void dump_dmesg_structured(int fd) |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0010-fs2dt.c-work-around-missing-getline.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0010-fs2dt.c-work-around-missing-getline.patch index cff1485e5..4652f10a6 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0010-fs2dt.c-work-around-missing-getline.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0010-fs2dt.c-work-around-missing-getline.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From edefda702d906d472ee7a675f6b506d5cfca7ac8 Mon Sep 17 00:00:00 2001 | 1 | From 14d4dbd293c75bc81a0dde6e678f9bbefb40b6f1 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Tue, 17 Apr 2018 13:48:25 +0200 | 3 | Date: Tue, 17 Apr 2018 13:48:25 +0200 |
4 | Subject: [PATCH] fs2dt.c: work around missing getline() | 4 | Subject: [PATCH] fs2dt.c: work around missing getline() |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch index 636151bee..5bbb178bc 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch | |||
@@ -1,16 +1,17 @@ | |||
1 | From 9b6866b106eb3ad11115bd591a23e65a68dd847d Mon Sep 17 00:00:00 2001 | 1 | From b6ebe05dc389b9457e3707401411fd075230b10e Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Tue, 21 Aug 2018 16:31:44 +0200 | 3 | Date: Tue, 21 Aug 2018 16:31:44 +0200 |
4 | Subject: [PATCH 11/11] purgatory Makefile: adapt to klcc | 4 | Subject: [PATCH] purgatory Makefile: adapt to klcc |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [klibc specific] | 6 | Upstream-Status: Inappropriate [klibc specific] |
7 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 7 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | purgatory/Makefile | 6 +++--- | 10 | purgatory/Makefile | 6 +++--- |
10 | 1 file changed, 3 insertions(+), 3 deletions(-) | 11 | 1 file changed, 3 insertions(+), 3 deletions(-) |
11 | 12 | ||
12 | diff --git a/purgatory/Makefile b/purgatory/Makefile | 13 | diff --git a/purgatory/Makefile b/purgatory/Makefile |
13 | index 49ce80a..72eefaa 100644 | 14 | index 49ce80a..1542b3a 100644 |
14 | --- a/purgatory/Makefile | 15 | --- a/purgatory/Makefile |
15 | +++ b/purgatory/Makefile | 16 | +++ b/purgatory/Makefile |
16 | @@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c | 17 | @@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c |
@@ -33,6 +34,3 @@ index 49ce80a..72eefaa 100644 | |||
33 | -Wl,-Map=$(PURGATORY_MAP) | 34 | -Wl,-Map=$(PURGATORY_MAP) |
34 | 35 | ||
35 | $(PURGATORY): $(PURGATORY_OBJS) | 36 | $(PURGATORY): $(PURGATORY_OBJS) |
36 | -- | ||
37 | 2.7.4 | ||
38 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0012-purgatory-string.c-avoid-inclusion-of-string.h.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0012-purgatory-string.c-avoid-inclusion-of-string.h.patch index 20934da89..db0d76317 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0012-purgatory-string.c-avoid-inclusion-of-string.h.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0012-purgatory-string.c-avoid-inclusion-of-string.h.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2d2ad16f9328a7cbb3f5b8479ae93eb923a0727f Mon Sep 17 00:00:00 2001 | 1 | From 9bb386018257e1e18ffe0e925201946515b31080 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Thu, 19 Apr 2018 00:28:14 +0200 | 3 | Date: Thu, 19 Apr 2018 00:28:14 +0200 |
4 | Subject: [PATCH] purgatory/string.c: avoid inclusion of string.h | 4 | Subject: [PATCH] purgatory/string.c: avoid inclusion of string.h |
@@ -26,6 +26,3 @@ index f06c460..c5e978a 100644 | |||
26 | 26 | ||
27 | size_t strnlen(const char *s, size_t max) | 27 | size_t strnlen(const char *s, size_t max) |
28 | { | 28 | { |
29 | -- | ||
30 | 2.7.4 | ||
31 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0013-sha256.h-avoid-inclusion-of-sys-types.h.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0013-sha256.h-avoid-inclusion-of-sys-types.h.patch index 5d1664f76..777cbcf94 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0013-sha256.h-avoid-inclusion-of-sys-types.h.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0013-sha256.h-avoid-inclusion-of-sys-types.h.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ec6000b9f287e62cb0746e26cfa4372c7ea528f4 Mon Sep 17 00:00:00 2001 | 1 | From 60098810e1c04be677794bff6a3935011af98934 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Thu, 19 Apr 2018 23:26:43 +0200 | 3 | Date: Thu, 19 Apr 2018 23:26:43 +0200 |
4 | Subject: [PATCH] sha256.h: avoid inclusion of sys/types.h | 4 | Subject: [PATCH] sha256.h: avoid inclusion of sys/types.h |
@@ -31,6 +31,3 @@ index 467fb22..40fd3ed 100644 | |||
31 | #include <stdint.h> | 31 | #include <stdint.h> |
32 | 32 | ||
33 | typedef struct | 33 | typedef struct |
34 | -- | ||
35 | 2.7.4 | ||
36 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch index ad2126698..f4d0d5d94 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b15e9610b4ab52c381e712241d50dea96d50d873 Mon Sep 17 00:00:00 2001 | 1 | From 04eec97b390621f2b3794b0d774b77429eb88cfd Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Wed, 2 May 2018 23:14:19 +0200 | 3 | Date: Wed, 2 May 2018 23:14:19 +0200 |
4 | Subject: [PATCH 14/14] add if_nameindex from musl | 4 | Subject: [PATCH] add if_nameindex from musl |
5 | 5 | ||
6 | Taken from musl, minimal changes. | 6 | Taken from musl, minimal changes. |
7 | klibc lacks struct and func | 7 | klibc lacks struct and func |
@@ -20,10 +20,11 @@ to fix : | |||
20 | #define __bitwise __bitwise__ | 20 | #define __bitwise __bitwise__ |
21 | 21 | ||
22 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 22 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
23 | |||
23 | --- | 24 | --- |
24 | kexec/Makefile | 2 +- | 25 | kexec/Makefile | 2 +- |
25 | kexec/if_nameindex.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ | 26 | kexec/if_nameindex.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ |
26 | kexec/if_nameindex.h | 15 ++++++++++++ | 27 | kexec/if_nameindex.h | 15 +++++++++++ |
27 | kexec/ifdown.c | 3 +++ | 28 | kexec/ifdown.c | 3 +++ |
28 | 4 files changed, 83 insertions(+), 1 deletion(-) | 29 | 4 files changed, 83 insertions(+), 1 deletion(-) |
29 | create mode 100644 kexec/if_nameindex.c | 30 | create mode 100644 kexec/if_nameindex.c |
@@ -114,7 +115,7 @@ index 0000000..e586e41 | |||
114 | +} | 115 | +} |
115 | diff --git a/kexec/if_nameindex.h b/kexec/if_nameindex.h | 116 | diff --git a/kexec/if_nameindex.h b/kexec/if_nameindex.h |
116 | new file mode 100644 | 117 | new file mode 100644 |
117 | index 0000000..1725fbd | 118 | index 0000000..cf1c061 |
118 | --- /dev/null | 119 | --- /dev/null |
119 | +++ b/kexec/if_nameindex.h | 120 | +++ b/kexec/if_nameindex.h |
120 | @@ -0,0 +1,15 @@ | 121 | @@ -0,0 +1,15 @@ |
@@ -147,6 +148,3 @@ index 82c6141..cc3ca9f 100644 | |||
147 | 148 | ||
148 | /* | 149 | /* |
149 | * First, we find all shaper devices and down them. Then we | 150 | * First, we find all shaper devices and down them. Then we |
150 | -- | ||
151 | 2.7.4 | ||
152 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch index 0b88b94c6..9b8107aed 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch | |||
@@ -1,17 +1,18 @@ | |||
1 | From 3294266c6a875c5009065c1ae5d0b86200c4147c Mon Sep 17 00:00:00 2001 | 1 | From a2679731a56748de58a4cf0a46b7a15d75543a88 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Sun, 29 Apr 2018 00:52:31 +0200 | 3 | Date: Sun, 29 Apr 2018 00:52:31 +0200 |
4 | Subject: [PATCH 6/6] vmcore-dmesg: fix warning | 4 | Subject: [PATCH] vmcore-dmesg: fix warning |
5 | 5 | ||
6 | # define __bitwise | 6 | # define __bitwise |
7 | 7 | ||
8 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 8 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
9 | |||
9 | --- | 10 | --- |
10 | vmcore-dmesg/vmcore-dmesg.c | 3 +++ | 11 | vmcore-dmesg/vmcore-dmesg.c | 3 +++ |
11 | 1 file changed, 3 insertions(+) | 12 | 1 file changed, 3 insertions(+) |
12 | 13 | ||
13 | diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c | 14 | diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c |
14 | index e340ef4..91e4789 100644 | 15 | index c63ac4f..a4e3014 100644 |
15 | --- a/vmcore-dmesg/vmcore-dmesg.c | 16 | --- a/vmcore-dmesg/vmcore-dmesg.c |
16 | +++ b/vmcore-dmesg/vmcore-dmesg.c | 17 | +++ b/vmcore-dmesg/vmcore-dmesg.c |
17 | @@ -2,6 +2,9 @@ | 18 | @@ -2,6 +2,9 @@ |
@@ -24,6 +25,3 @@ index e340ef4..91e4789 100644 | |||
24 | #include <endian.h> | 25 | #include <endian.h> |
25 | #include <byteswap.h> | 26 | #include <byteswap.h> |
26 | #include <stdio.h> | 27 | #include <stdio.h> |
27 | -- | ||
28 | 2.7.4 | ||
29 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch index b3ef3c82d..bd728ccb4 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5ea7cd78cd252ffd3a9f3fbc8dc795d6e1596084 Mon Sep 17 00:00:00 2001 | 1 | From 7bd94a64cd5424e74ad49dbda65a15e83670268f Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Mon, 17 Dec 2018 11:25:20 +0100 | 3 | Date: Mon, 17 Dec 2018 11:25:20 +0100 |
4 | Subject: [PATCH] kexec-tools: fix non-device tree devices on mips | 4 | Subject: [PATCH] kexec-tools: fix non-device tree devices on mips |
@@ -14,6 +14,7 @@ Removed ppc change (unwanted ?) | |||
14 | 14 | ||
15 | Signed-off-by: Konstantin Kuzov <master.nosferatu@gmail.com> | 15 | Signed-off-by: Konstantin Kuzov <master.nosferatu@gmail.com> |
16 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 16 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
17 | |||
17 | --- | 18 | --- |
18 | kexec/arch/mips/include/arch/options.h | 4 +- | 19 | kexec/arch/mips/include/arch/options.h | 4 +- |
19 | kexec/arch/mips/kexec-elf-mips.c | 58 ++++++++++++++------------ | 20 | kexec/arch/mips/kexec-elf-mips.c | 58 ++++++++++++++------------ |
@@ -158,6 +159,3 @@ index 222c815..90b21c3 100644 | |||
158 | }; | 159 | }; |
159 | 160 | ||
160 | extern struct memory_ranges usablemem_rgns; | 161 | extern struct memory_ranges usablemem_rgns; |
161 | -- | ||
162 | 2.17.1 | ||
163 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch index 24be4dd76..c2418d8fa 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 6f69f489a442b3a192e4c08748ee8c4d31c75dae Mon Sep 17 00:00:00 2001 | 1 | From 3fd4db2ce1710f45eb297ae6b2c10726b33204f3 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Sun, 29 Apr 2018 00:46:16 +0200 | 3 | Date: Sun, 29 Apr 2018 00:46:16 +0200 |
4 | Subject: [PATCH 5/6] arm64: crashdump-arm64.c: fix warning | 4 | Subject: [PATCH] arm64: crashdump-arm64.c: fix warning |
5 | 5 | ||
6 | from ../git/kexec/kexec.h:6, | 6 | from ../git/kexec/kexec.h:6, |
7 | from ../git/kexec/arch/arm64/crashdump-arm64.c:18: | 7 | from ../git/kexec/arch/arm64/crashdump-arm64.c:18: |
@@ -11,6 +11,7 @@ ng: "__bitwise" redefined | |||
11 | # define __bitwise | 11 | # define __bitwise |
12 | 12 | ||
13 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 13 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
14 | |||
14 | --- | 15 | --- |
15 | kexec/arch/arm64/crashdump-arm64.c | 3 +++ | 16 | kexec/arch/arm64/crashdump-arm64.c | 3 +++ |
16 | 1 file changed, 3 insertions(+) | 17 | 1 file changed, 3 insertions(+) |
@@ -29,6 +30,3 @@ index 4fd7aa8..890d88f 100644 | |||
29 | #include <linux/elf.h> | 30 | #include <linux/elf.h> |
30 | 31 | ||
31 | #include "kexec.h" | 32 | #include "kexec.h" |
32 | -- | ||
33 | 2.7.4 | ||
34 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-arm64.c-workaround-for-getrandom-syscall.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-arm64.c-workaround-for-getrandom-syscall.patch index b22ac3aca..df7b0a778 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-arm64.c-workaround-for-getrandom-syscall.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-arm64.c-workaround-for-getrandom-syscall.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 10afeecd10499fbd64b2c68d3b076c6906df441f Mon Sep 17 00:00:00 2001 | 1 | From a99fc685214452aedabf9ac105bb99357006aa26 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Wed, 5 Sep 2018 17:07:48 +0200 | 3 | Date: Wed, 5 Sep 2018 17:07:48 +0200 |
4 | Subject: [PATCH] kexec-arm64.c: workaround for getrandom() syscall | 4 | Subject: [PATCH] kexec-arm64.c: workaround for getrandom() syscall |
@@ -15,15 +15,15 @@ and | |||
15 | | ../git/kexec/arch/arm64/kexec-arm64.c:499:12: warning: implicit declaration of function 'getrandom'; did you mean 'srandom'? [-Wimplicit-function-declaration] | 15 | | ../git/kexec/arch/arm64/kexec-arm64.c:499:12: warning: implicit declaration of function 'getrandom'; did you mean 'srandom'? [-Wimplicit-function-declaration] |
16 | | result = getrandom(&fdt_val64, | 16 | | result = getrandom(&fdt_val64, |
17 | 17 | ||
18 | |||
19 | Upstream-Status: Inappropriate [klibc specific] | 18 | Upstream-Status: Inappropriate [klibc specific] |
20 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 19 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
20 | |||
21 | --- | 21 | --- |
22 | kexec/arch/arm64/kexec-arm64.c | 12 +++++++++++- | 22 | kexec/arch/arm64/kexec-arm64.c | 12 +++++++++++- |
23 | 1 file changed, 11 insertions(+), 1 deletion(-) | 23 | 1 file changed, 11 insertions(+), 1 deletion(-) |
24 | 24 | ||
25 | diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c | 25 | diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c |
26 | index 7a12479..8a7f5c5 100644 | 26 | index b143e86..88d4168 100644 |
27 | --- a/kexec/arch/arm64/kexec-arm64.c | 27 | --- a/kexec/arch/arm64/kexec-arm64.c |
28 | +++ b/kexec/arch/arm64/kexec-arm64.c | 28 | +++ b/kexec/arch/arm64/kexec-arm64.c |
29 | @@ -16,7 +16,11 @@ | 29 | @@ -16,7 +16,11 @@ |
@@ -54,8 +54,5 @@ index 7a12479..8a7f5c5 100644 | |||
54 | + GRND_NONBLOCK); | 54 | + GRND_NONBLOCK); |
55 | +#endif | 55 | +#endif |
56 | if(result == -1) { | 56 | if(result == -1) { |
57 | dbgprintf("%s: Reading random bytes failed.\n", | 57 | fprintf(stderr, "%s: Reading random bytes failed.\n", |
58 | __func__); | 58 | __func__); |
59 | -- | ||
60 | 2.7.4 | ||
61 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-image-header.h-add-missing-le64toh.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-image-header.h-add-missing-le64toh.patch index 7decbac4f..cdcecdf41 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-image-header.h-add-missing-le64toh.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-image-header.h-add-missing-le64toh.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From af7d06a753a4c377b7ffe587da67a6ba56048bea Mon Sep 17 00:00:00 2001 | 1 | From c5e7928217ee73640d25c6471c4619601cb1ba19 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Thu, 19 Apr 2018 10:47:17 +0200 | 3 | Date: Thu, 19 Apr 2018 10:47:17 +0200 |
4 | Subject: [PATCH 2/2] kexec/arm64: image-header.h: add macro for le64toh | 4 | Subject: [PATCH] kexec/arm64: image-header.h: add macro for le64toh |
5 | 5 | ||
6 | Fix | 6 | Fix |
7 | 7 | ||
@@ -35,6 +35,3 @@ index 158d411..10ed2d6 100644 | |||
35 | /** | 35 | /** |
36 | * struct arm64_image_header - arm64 kernel image header. | 36 | * struct arm64_image_header - arm64 kernel image header. |
37 | * | 37 | * |
38 | -- | ||
39 | 2.7.4 | ||
40 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch index c6afdfae7..5323a81e6 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch | |||
@@ -1,15 +1,16 @@ | |||
1 | From 06b0d43c20f7c6200902d4c6db3d33416877f71c Mon Sep 17 00:00:00 2001 | 1 | From edf186f45d543e318400195cc25175387ff3f5c4 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Sun, 26 Aug 2018 21:40:06 +0200 | 3 | Date: Sun, 26 Aug 2018 21:40:06 +0200 |
4 | Subject: [PATCH 1/1] arm- backport from oe-core | 4 | Subject: [PATCH] arm- backport from oe-core |
5 | 5 | ||
6 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 6 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
7 | |||
7 | --- | 8 | --- |
8 | kexec/arch/arm/crashdump-arm.c | 5 ++++- | 9 | kexec/arch/arm/crashdump-arm.c | 5 ++++- |
9 | 1 file changed, 4 insertions(+), 1 deletion(-) | 10 | 1 file changed, 4 insertions(+), 1 deletion(-) |
10 | 11 | ||
11 | diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c | 12 | diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c |
12 | index 2530b29..af2600d 100644 | 13 | index daa4788..3f72b38 100644 |
13 | --- a/kexec/arch/arm/crashdump-arm.c | 14 | --- a/kexec/arch/arm/crashdump-arm.c |
14 | +++ b/kexec/arch/arm/crashdump-arm.c | 15 | +++ b/kexec/arch/arm/crashdump-arm.c |
15 | @@ -240,6 +240,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | 16 | @@ -240,6 +240,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) |
@@ -39,6 +40,3 @@ index 2530b29..af2600d 100644 | |||
39 | crash_kernel_mem.start, | 40 | crash_kernel_mem.start, |
40 | crash_kernel_mem.end, -1, 0); | 41 | crash_kernel_mem.end, -1, 0); |
41 | 42 | ||
42 | -- | ||
43 | 2.7.4 | ||
44 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump.patch index 95962636e..2d1d64db1 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6dae4752a53973c152b3e91e8a4ca74a486dae8b Mon Sep 17 00:00:00 2001 | 1 | From 8ee92bc915d650e188caaa3df0a798ac2002f64e Mon Sep 17 00:00:00 2001 |
2 | From: OpenEmbedded <oe.patch@oe> | 2 | From: OpenEmbedded <oe.patch@oe> |
3 | Date: Wed, 11 Apr 2018 22:51:00 +0200 | 3 | Date: Wed, 11 Apr 2018 22:51:00 +0200 |
4 | Subject: [PATCH] use our elf.h header | 4 | Subject: [PATCH] use our elf.h header |
@@ -17,7 +17,7 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
18 | 18 | ||
19 | diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c | 19 | diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c |
20 | index daa4788..2530b29 100644 | 20 | index 3f72b38..af2600d 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 | @@ -21,7 +21,7 @@ | 23 | @@ -21,7 +21,7 @@ |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/kexec-x32.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/kexec-x32.patch index 26d18eb6f..3c2594a5d 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/kexec-x32.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/kexec-x32.patch | |||
@@ -1,4 +1,10 @@ | |||
1 | x86_64: Add support to build kexec-tools with x32 ABI | 1 | From fd40eee42273220fb0050fe10744b10067adc0a7 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> | ||
3 | Date: Fri, 31 Aug 2018 17:31:50 +0200 | ||
4 | Subject: [PATCH] x86_64: Add support to build kexec-tools with x32 ABI | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
2 | 8 | ||
3 | Summary of changes, | 9 | Summary of changes, |
4 | 10 | ||
@@ -21,11 +27,11 @@ Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> | |||
21 | purgatory/arch/x86_64/Makefile | 4 +++- | 27 | purgatory/arch/x86_64/Makefile | 4 +++- |
22 | 4 files changed, 20 insertions(+), 1 deletion(-) | 28 | 4 files changed, 20 insertions(+), 1 deletion(-) |
23 | 29 | ||
24 | Index: kexec-tools-2.0.10/configure.ac | 30 | diff --git a/configure.ac b/configure.ac |
25 | =================================================================== | 31 | index e05d601..c428146 100644 |
26 | --- kexec-tools-2.0.10.orig/configure.ac | 32 | --- a/configure.ac |
27 | +++ kexec-tools-2.0.10/configure.ac | 33 | +++ b/configure.ac |
28 | @@ -56,6 +56,15 @@ case $target_cpu in | 34 | @@ -54,6 +54,15 @@ case $target_cpu in |
29 | ;; | 35 | ;; |
30 | ia64|x86_64|alpha|m68k ) | 36 | ia64|x86_64|alpha|m68k ) |
31 | ARCH="$target_cpu" | 37 | ARCH="$target_cpu" |
@@ -41,11 +47,11 @@ Index: kexec-tools-2.0.10/configure.ac | |||
41 | ;; | 47 | ;; |
42 | * ) | 48 | * ) |
43 | AC_MSG_ERROR([unsupported architecture $target_cpu]) | 49 | AC_MSG_ERROR([unsupported architecture $target_cpu]) |
44 | Index: kexec-tools-2.0.10/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 50 | diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c |
45 | =================================================================== | 51 | index 761a4ed..1c0e3f8 100644 |
46 | --- kexec-tools-2.0.10.orig/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 52 | --- 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 | 53 | +++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c |
48 | @@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_eh | 54 | @@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) |
49 | if (ehdr->ei_data != ELFDATA2LSB) { | 55 | if (ehdr->ei_data != ELFDATA2LSB) { |
50 | return 0; | 56 | return 0; |
51 | } | 57 | } |
@@ -57,10 +63,10 @@ Index: kexec-tools-2.0.10/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | |||
57 | return 0; | 63 | return 0; |
58 | } | 64 | } |
59 | if (ehdr->e_machine != EM_X86_64) { | 65 | if (ehdr->e_machine != EM_X86_64) { |
60 | Index: kexec-tools-2.0.10/kexec/kexec-syscall.h | 66 | diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h |
61 | =================================================================== | 67 | index 2a3794d..3e67078 100644 |
62 | --- kexec-tools-2.0.10.orig/kexec/kexec-syscall.h | 68 | --- a/kexec/kexec-syscall.h |
63 | +++ kexec-tools-2.0.10/kexec/kexec-syscall.h | 69 | +++ b/kexec/kexec-syscall.h |
64 | @@ -31,8 +31,12 @@ | 70 | @@ -31,8 +31,12 @@ |
65 | #define __NR_kexec_load 268 | 71 | #define __NR_kexec_load 268 |
66 | #endif | 72 | #endif |
@@ -74,11 +80,11 @@ Index: kexec-tools-2.0.10/kexec/kexec-syscall.h | |||
74 | #ifdef __s390x__ | 80 | #ifdef __s390x__ |
75 | #define __NR_kexec_load 277 | 81 | #define __NR_kexec_load 277 |
76 | #endif | 82 | #endif |
77 | Index: kexec-tools-2.0.10/purgatory/arch/x86_64/Makefile | 83 | diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile |
78 | =================================================================== | 84 | index 7300937..4af11e4 100644 |
79 | --- kexec-tools-2.0.10.orig/purgatory/arch/x86_64/Makefile | 85 | --- a/purgatory/arch/x86_64/Makefile |
80 | +++ kexec-tools-2.0.10/purgatory/arch/x86_64/Makefile | 86 | +++ b/purgatory/arch/x86_64/Makefile |
81 | @@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/ | 87 | @@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c |
82 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c | 88 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c |
83 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c | 89 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c |
84 | 90 | ||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/klibc-reboot.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/klibc-reboot.patch index be1301df6..6497fb416 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/klibc-reboot.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/klibc-reboot.patch | |||
@@ -1,3 +1,13 @@ | |||
1 | From 9c99b0748dd0ea1aaf3836378ee75fa5af099a19 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 15 Mar 2019 00:22:40 -0700 | ||
4 | |||
5 | --- | ||
6 | kexec/kexec.c | 2 +- | ||
7 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
8 | |||
9 | diff --git a/kexec/kexec.c b/kexec/kexec.c | ||
10 | index 157c577..5da0d67 100644 | ||
1 | --- a/kexec/kexec.c | 11 | --- a/kexec/kexec.c |
2 | +++ b/kexec/kexec.c | 12 | +++ b/kexec/kexec.c |
3 | @@ -901,7 +901,7 @@ static int my_exec(void) | 13 | @@ -901,7 +901,7 @@ static int my_exec(void) |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc-purgatory-Makefile-remove-unknown-flags.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc-purgatory-Makefile-remove-unknown-flags.patch index c3b2071bc..8fb9f443a 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc-purgatory-Makefile-remove-unknown-flags.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc-purgatory-Makefile-remove-unknown-flags.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 709dfe457c07aa0275f3da14634cbce5cf1029dc Mon Sep 17 00:00:00 2001 | 1 | From 3683b3f3e318fa711f6018f154d950c51d5b597a Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Thu, 19 Apr 2018 19:26:53 +0200 | 3 | Date: Thu, 19 Apr 2018 19:26:53 +0200 |
4 | Subject: [PATCH 3/3] powerpc/purgatory: Makefile: remove unknown flags for | 4 | Subject: [PATCH] powerpc/purgatory: Makefile: remove unknown flags for powerpc |
5 | powerpc | ||
6 | 5 | ||
7 | Fix | 6 | Fix |
8 | 7 | ||
@@ -12,6 +11,7 @@ Fix | |||
12 | 11 | ||
13 | Upstream-Status: Inappropriate [klibc specific] | 12 | Upstream-Status: Inappropriate [klibc specific] |
14 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 13 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
14 | |||
15 | --- | 15 | --- |
16 | purgatory/arch/ppc/Makefile | 2 +- | 16 | purgatory/arch/ppc/Makefile | 2 +- |
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -29,6 +29,3 @@ index c85c58a..cd44a16 100644 | |||
29 | 29 | ||
30 | dist += purgatory/arch/ppc/Makefile $(ppc_PURGATORY_SRCS) \ | 30 | dist += purgatory/arch/ppc/Makefile $(ppc_PURGATORY_SRCS) \ |
31 | purgatory/arch/ppc/purgatory-ppc.h purgatory/arch/ppc/ppc_asm.h | 31 | purgatory/arch/ppc/purgatory-ppc.h purgatory/arch/ppc/ppc_asm.h |
32 | -- | ||
33 | 2.7.4 | ||
34 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc_change-the-memory-size-limit.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc_change-the-memory-size-limit.patch index dc97d930e..67a3cac1f 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc_change-the-memory-size-limit.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc_change-the-memory-size-limit.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b19b68eab567aa534cf8dec79fe18e3dc0e14043 Mon Sep 17 00:00:00 2001 | 1 | From 6fec72bd7264478c214169b0f30f649304bd39ea Mon Sep 17 00:00:00 2001 |
2 | From: Quanyang Wang <quanyang.wang@windriver.com> | 2 | From: Quanyang Wang <quanyang.wang@windriver.com> |
3 | Date: Tue, 16 Jun 2015 12:59:57 +0800 | 3 | Date: Tue, 16 Jun 2015 12:59:57 +0800 |
4 | Subject: [PATCH] powerpc: change the memory size limit | 4 | Subject: [PATCH] powerpc: change the memory size limit |
@@ -16,15 +16,16 @@ locate_hole failed | |||
16 | Upstream-Status: Pending | 16 | Upstream-Status: Pending |
17 | 17 | ||
18 | Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> | 18 | Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> |
19 | |||
19 | --- | 20 | --- |
20 | kexec/arch/ppc/kexec-ppc.h | 2 +- | 21 | kexec/arch/ppc/kexec-ppc.h | 2 +- |
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
22 | 23 | ||
23 | Index: kexec-tools-2.0.10/kexec/arch/ppc/kexec-ppc.h | 24 | diff --git a/kexec/arch/ppc/kexec-ppc.h b/kexec/arch/ppc/kexec-ppc.h |
24 | =================================================================== | 25 | index 04e728e..6bae9ec 100644 |
25 | --- kexec-tools-2.0.10.orig/kexec/arch/ppc/kexec-ppc.h | 26 | --- a/kexec/arch/ppc/kexec-ppc.h |
26 | +++ kexec-tools-2.0.10/kexec/arch/ppc/kexec-ppc.h | 27 | +++ b/kexec/arch/ppc/kexec-ppc.h |
27 | @@ -42,7 +42,7 @@ void dol_ppc_usage(void); | 28 | @@ -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 | 29 | * 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). | 30 | * it. On Book-E that is 64MiB, 601 24MiB or 256MiB (if possible). |
30 | */ | 31 | */ |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_basename.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_basename.patch index 0d0ed23c9..568f19758 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_basename.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_basename.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5f47c30759684cea9a7a409646686c1a358b78ac Mon Sep 17 00:00:00 2001 | 1 | From 7823956149c78e1996c567d1965803456df090f8 Mon Sep 17 00:00:00 2001 |
2 | From: OpenEmbedded <oe.patch@oe> | 2 | From: OpenEmbedded <oe.patch@oe> |
3 | Date: Wed, 11 Apr 2018 22:51:05 +0200 | 3 | Date: Wed, 11 Apr 2018 22:51:05 +0200 |
4 | Subject: [PATCH] replace basename() with sscanf() | 4 | Subject: [PATCH] replace basename() with sscanf() |
@@ -13,7 +13,7 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c | 15 | diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c |
16 | index 6c7d260..7850083 100644 | 16 | index 6cda12c..5514c1c 100644 |
17 | --- a/kexec/arch/i386/x86-linux-setup.c | 17 | --- a/kexec/arch/i386/x86-linux-setup.c |
18 | +++ b/kexec/arch/i386/x86-linux-setup.c | 18 | +++ b/kexec/arch/i386/x86-linux-setup.c |
19 | @@ -304,9 +304,9 @@ static int add_edd_entry(struct x86_linux_param_header *real_mode, | 19 | @@ -304,9 +304,9 @@ static int add_edd_entry(struct x86_linux_param_header *real_mode, |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch index 1c471f559..ecb0d85e2 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9de68ec5af8db2eff352f12da28145fe5e96244d Mon Sep 17 00:00:00 2001 | 1 | From e26fe77b0ac9acc2c8086586d267aa7160969d2d Mon Sep 17 00:00:00 2001 |
2 | From: OpenEmbedded <oe.patch@oe> | 2 | From: OpenEmbedded <oe.patch@oe> |
3 | Date: Wed, 11 Apr 2018 22:51:05 +0200 | 3 | Date: Wed, 11 Apr 2018 22:51:05 +0200 |
4 | Subject: [PATCH] do not build test | 4 | Subject: [PATCH] do not build test |
@@ -14,7 +14,7 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 15 | ||
16 | diff --git a/Makefile.in b/Makefile.in | 16 | diff --git a/Makefile.in b/Makefile.in |
17 | index fb01134..440730d 100644 | 17 | index dbf1fb6..440730d 100644 |
18 | --- a/Makefile.in | 18 | --- a/Makefile.in |
19 | +++ b/Makefile.in | 19 | +++ b/Makefile.in |
20 | @@ -173,8 +173,8 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) | 20 | @@ -173,8 +173,8 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_sys_io.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_sys_io.patch index 493f298a9..ef9a411b5 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_sys_io.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_sys_io.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a992ee014efacdc98d5658be9930dcab0eaadfd7 Mon Sep 17 00:00:00 2001 | 1 | From 444160260a11022ecd84cd605fe8c22b316e6546 Mon Sep 17 00:00:00 2001 |
2 | From: OpenEmbedded <oe.patch@oe> | 2 | From: OpenEmbedded <oe.patch@oe> |
3 | Date: Wed, 11 Apr 2018 22:51:04 +0200 | 3 | Date: Wed, 11 Apr 2018 22:51:04 +0200 |
4 | Subject: [PATCH] i386: replace with our io.h | 4 | Subject: [PATCH] i386: replace with our io.h |
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_vfscanf.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_vfscanf.patch index 2f0ad2ea4..af8467a23 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_vfscanf.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_vfscanf.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 423c3f6f41fe04f4512e2a97a130f072d53dd4cf Mon Sep 17 00:00:00 2001 | 1 | From c6934455ec2337e6da7ea9fbc3486ce9beeb5d82 Mon Sep 17 00:00:00 2001 |
2 | From: OpenEmbedded <oe.patch@oe> | 2 | From: OpenEmbedded <oe.patch@oe> |
3 | Date: Wed, 11 Apr 2018 22:51:05 +0200 | 3 | Date: Wed, 11 Apr 2018 22:51:05 +0200 |
4 | Subject: [PATCH] x86-linux-setup.c: replace vfscanf() with vsscanf() | 4 | Subject: [PATCH] x86-linux-setup.c: replace vfscanf() with vsscanf() |
@@ -13,7 +13,7 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | |||
13 | 1 file changed, 10 insertions(+), 1 deletion(-) | 13 | 1 file changed, 10 insertions(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c | 15 | diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c |
16 | index 7850083..e190356 100644 | 16 | index 5514c1c..bdb28c6 100644 |
17 | --- a/kexec/arch/i386/x86-linux-setup.c | 17 | --- a/kexec/arch/i386/x86-linux-setup.c |
18 | +++ b/kexec/arch/i386/x86-linux-setup.c | 18 | +++ b/kexec/arch/i386/x86-linux-setup.c |
19 | @@ -200,6 +200,8 @@ static int file_scanf(const char *dir, const char *file, const char *scanf_line, | 19 | @@ -200,6 +200,8 @@ static int file_scanf(const char *dir, const char *file, const char *scanf_line, |