[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously
Arnout Vandecappelle
arnout at mind.be
Wed Mar 16 21:31:18 UTC 2016
On 03/16/16 16:50, Benoît Allard wrote:
> This becomes handy when building hybrid images that needs to be able to boot
> in MBR and GPT mode.
>
> Signed-off-by: Benoît Allard <benoit.allard at greenbone.net>
> ---
> boot/syslinux/Config.in | 3 ---
> boot/syslinux/syslinux.mk | 4 ++--
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
> index f4b9870..ea0fb16 100644
> --- a/boot/syslinux/Config.in
> +++ b/boot/syslinux/Config.in
> @@ -13,8 +13,6 @@ if BR2_TARGET_SYSLINUX
> config BR2_TARGET_SYSLINUX_LEGACY_BIOS
> bool
>
> -choice
> - bool "Image to install"
>
> config BR2_TARGET_SYSLINUX_ISOLINUX
> bool "isolinux"
The menu entries make less sense now. Either keep a comment above, or change
all the prompts into "install isolinux" ...
> @@ -44,7 +42,6 @@ config BR2_TARGET_SYSLINUX_EFI
> help
> Install the 'efi' image, to boot from an EFI environment.
>
It is now possible that no image is selected at all. I think this will be
pretty bad for the build - probably, everything will be built but nothing
installed. So we either have to force one of the images to be selected, or add a
check in the .mk file that at least one of them is selected. I'm not sure what
the best solution is here.
Regards,
Arnout
> -endchoice
>
> if BR2_TARGET_SYSLINUX_LEGACY_BIOS
>
> diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
> index 0868896..82890c5 100644
> --- a/boot/syslinux/syslinux.mk
> +++ b/boot/syslinux/syslinux.mk
> @@ -16,7 +16,7 @@ SYSLINUX_INSTALL_IMAGES = YES
> SYSLINUX_DEPENDENCIES = host-nasm host-util-linux host-upx
>
> ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y)
> -SYSLINUX_TARGET = bios
> +SYSLINUX_TARGET += bios
> endif
>
> # The syslinux build system must be forced to use Buildroot's gnu-efi
> @@ -30,7 +30,7 @@ else
> SYSLINUX_EFI_BITS = efi32
> endif # 64-bit
> SYSLINUX_DEPENDENCIES += gnu-efi
> -SYSLINUX_TARGET = $(SYSLINUX_EFI_BITS)
> +SYSLINUX_TARGET += $(SYSLINUX_EFI_BITS)
> SYSLINUX_EFI_ARGS = \
> EFIINC=$(STAGING_DIR)/usr/include/efi \
> LIBDIR=$(STAGING_DIR)/usr/lib \
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
More information about the buildroot
mailing list