* [Buildroot] [PATCH 1/1] package/kexec: fix i386 build
@ 2020-05-01 12:59 Fabrice Fontaine
2020-05-01 13:09 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2020-05-01 12:59 UTC (permalink / raw)
To: buildroot
Fixes:
- http://autobuild.buildroot.org/results/905178cd793dc2b9b26814f7736186b33b468741
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...0001-kexec-build-multiboot2-for-i386.patch | 72 +++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 package/kexec/0001-kexec-build-multiboot2-for-i386.patch
diff --git a/package/kexec/0001-kexec-build-multiboot2-for-i386.patch b/package/kexec/0001-kexec-build-multiboot2-for-i386.patch
new file mode 100644
index 0000000000..c67da98ce7
--- /dev/null
+++ b/package/kexec/0001-kexec-build-multiboot2-for-i386.patch
@@ -0,0 +1,72 @@
+From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001
+From: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Date: Mon, 18 Nov 2019 12:52:15 +1300
+Subject: kexec: build multiboot2 for i386
+
+This addresses the following compilation issues when building for i386.
+
+ kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'?
+ { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
+ ^~~~~~~~~~~~~~~~~~~~
+ multiboot_x86_probe
+ kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'?
+ { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
+ ^~~~~~~~~~~~~~~~~~~
+ multiboot_x86_load
+ kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'?
+ multiboot2_x86_usage },
+ ^~~~~~~~~~~~~~~~~~~~
+ multiboot_x86_usage
+ make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1
+ make: *** Waiting for unfinished jobs....
+
+Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=2c9f26ed20a791a7df0182ba82e93abb52f5a615]
+---
+ kexec/arch/i386/Makefile | 2 +-
+ kexec/arch/i386/kexec-x86.h | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
+index 105cefd..f486103 100644
+--- a/kexec/arch/i386/Makefile
++++ b/kexec/arch/i386/Makefile
+@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c
++i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
+ i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
+@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
+
+ dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \
+ kexec/arch/i386/crashdump-x86.h \
+- kexec/arch/i386/kexec-mb2-x86.c \
+ kexec/arch/i386/kexec-x86.h \
+ kexec/arch/i386/x86-linux-setup.h \
+ kexec/arch/i386/include/arch/options.h
+diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
+index 1b58c3b..0f941df 100644
+--- a/kexec/arch/i386/kexec-x86.h
++++ b/kexec/arch/i386/kexec-x86.h
+@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
+ struct kexec_info *info);
+ void multiboot_x86_usage(void);
+
++int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
++ struct kexec_info *info);
++void multiboot2_x86_usage(void);
++int multiboot2_x86_probe(const char *buf, off_t buf_len);
++
+ int elf_x86_probe(const char *buf, off_t len);
+ int elf_x86_load(int argc, char **argv, const char *buf, off_t len,
+ struct kexec_info *info);
+--
+cgit 1.2-0.3.lf.el7
+
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/kexec: fix i386 build
2020-05-01 12:59 [Buildroot] [PATCH 1/1] package/kexec: fix i386 build Fabrice Fontaine
@ 2020-05-01 13:09 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2020-05-01 13:09 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2020-05-01 14:59 +0200, Fabrice Fontaine spake thusly:
> Fixes:
> - http://autobuild.buildroot.org/results/905178cd793dc2b9b26814f7736186b33b468741
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...0001-kexec-build-multiboot2-for-i386.patch | 72 +++++++++++++++++++
> 1 file changed, 72 insertions(+)
> create mode 100644 package/kexec/0001-kexec-build-multiboot2-for-i386.patch
>
> diff --git a/package/kexec/0001-kexec-build-multiboot2-for-i386.patch b/package/kexec/0001-kexec-build-multiboot2-for-i386.patch
> new file mode 100644
> index 0000000000..c67da98ce7
> --- /dev/null
> +++ b/package/kexec/0001-kexec-build-multiboot2-for-i386.patch
> @@ -0,0 +1,72 @@
> +From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001
> +From: Chris Packham <chris.packham@alliedtelesis.co.nz>
> +Date: Mon, 18 Nov 2019 12:52:15 +1300
> +Subject: kexec: build multiboot2 for i386
> +
> +This addresses the following compilation issues when building for i386.
> +
> + kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'?
> + { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
> + ^~~~~~~~~~~~~~~~~~~~
> + multiboot_x86_probe
> + kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'?
> + { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
> + ^~~~~~~~~~~~~~~~~~~
> + multiboot_x86_load
> + kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'?
> + multiboot2_x86_usage },
> + ^~~~~~~~~~~~~~~~~~~~
> + multiboot_x86_usage
> + make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1
> + make: *** Waiting for unfinished jobs....
> +
> +Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
> +Signed-off-by: Simon Horman <horms@verge.net.au>
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Retrieved from:
> +https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=2c9f26ed20a791a7df0182ba82e93abb52f5a615]
> +---
> + kexec/arch/i386/Makefile | 2 +-
> + kexec/arch/i386/kexec-x86.h | 5 +++++
> + 2 files changed, 6 insertions(+), 1 deletion(-)
> +
> +diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
> +index 105cefd..f486103 100644
> +--- a/kexec/arch/i386/Makefile
> ++++ b/kexec/arch/i386/Makefile
> +@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c
> + i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c
> + i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c
> + i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c
> ++i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
> + i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
> + i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
> + i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
> +@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
> +
> + dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \
> + kexec/arch/i386/crashdump-x86.h \
> +- kexec/arch/i386/kexec-mb2-x86.c \
> + kexec/arch/i386/kexec-x86.h \
> + kexec/arch/i386/x86-linux-setup.h \
> + kexec/arch/i386/include/arch/options.h
> +diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
> +index 1b58c3b..0f941df 100644
> +--- a/kexec/arch/i386/kexec-x86.h
> ++++ b/kexec/arch/i386/kexec-x86.h
> +@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
> + struct kexec_info *info);
> + void multiboot_x86_usage(void);
> +
> ++int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
> ++ struct kexec_info *info);
> ++void multiboot2_x86_usage(void);
> ++int multiboot2_x86_probe(const char *buf, off_t buf_len);
> ++
> + int elf_x86_probe(const char *buf, off_t len);
> + int elf_x86_load(int argc, char **argv, const char *buf, off_t len,
> + struct kexec_info *info);
> +--
> +cgit 1.2-0.3.lf.el7
> +
> --
> 2.26.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-01 13:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-01 12:59 [Buildroot] [PATCH 1/1] package/kexec: fix i386 build Fabrice Fontaine
2020-05-01 13:09 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox