All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/kexec: fix i386 build
Date: Fri, 1 May 2020 15:09:09 +0200	[thread overview]
Message-ID: <20200501130909.GA11346@scaer> (raw)
In-Reply-To: <20200501125920.2225818-1-fontaine.fabrice@gmail.com>

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.  |
'------------------------------^-------^------------------^--------------------'

      reply	other threads:[~2020-05-01 13:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200501130909.GA11346@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.