NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syslinux: Allow to build multiple flavors simultaneously

Browse Source 
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@greenbone.net>
Tested-by: Matt Weber <matt@thewebers.ws>
Reviewed-by: Matt Weber <matt@thewebers.ws>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Benoît Allard 2016-03-17 09:09:16 +01:00 committed by Thomas Petazzoni
parent 6cb4814c87
commit 3177e74c8f
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
boot/syslinux/Config.in
View File

@ -2,6 +2,11 @@ config BR2_TARGET_SYSLINUX
bool "syslinux" bool "syslinux"
depends on BR2_i386 || BR2_x86_64 depends on BR2_i386 || BR2_x86_64
select BR2_HOSTARCH_NEEDS_IA32_COMPILER select BR2_HOSTARCH_NEEDS_IA32_COMPILER
# Make sure at least one of the flavors is installed
select BR2_TARGET_SYSLINUX_ISOLINUX \
if !BR2_TARGET_SYSLINUX_PXELINUX && \
!BR2_TARGET_SYSLINUX_MBR && \
!BR2_TARGET_SYSLINUX_EFI
help help
The syslinux bootloader for x86 systems. The syslinux bootloader for x86 systems.
This includes: syslinux, pxelinux, extlinux. This includes: syslinux, pxelinux, extlinux.
@ -13,25 +18,22 @@ if BR2_TARGET_SYSLINUX
config BR2_TARGET_SYSLINUX_LEGACY_BIOS config BR2_TARGET_SYSLINUX_LEGACY_BIOS
bool bool
choice
bool "Image to install"
config BR2_TARGET_SYSLINUX_ISOLINUX config BR2_TARGET_SYSLINUX_ISOLINUX
bool "isolinux" bool "install isolinux"
select BR2_TARGET_SYSLINUX_LEGACY_BIOS select BR2_TARGET_SYSLINUX_LEGACY_BIOS
help help
Install the legacy-BIOS 'isolinux' image, to boot off Install the legacy-BIOS 'isolinux' image, to boot off
optical media (CDROM, DVD.) optical media (CDROM, DVD.)
config BR2_TARGET_SYSLINUX_PXELINUX config BR2_TARGET_SYSLINUX_PXELINUX
bool "pxelinux" bool "install pxelinux"
select BR2_TARGET_SYSLINUX_LEGACY_BIOS select BR2_TARGET_SYSLINUX_LEGACY_BIOS
help help
Install the legacy-BIOS 'pxelinux' image, to boot off Install the legacy-BIOS 'pxelinux' image, to boot off
the network using PXE. the network using PXE.
config BR2_TARGET_SYSLINUX_MBR config BR2_TARGET_SYSLINUX_MBR
bool "mbr" bool "install mbr"
select BR2_TARGET_SYSLINUX_LEGACY_BIOS select BR2_TARGET_SYSLINUX_LEGACY_BIOS
help help
Install the legacy-BIOS 'mbr' image, to boot off a Install the legacy-BIOS 'mbr' image, to boot off a
@ -39,12 +41,11 @@ config BR2_TARGET_SYSLINUX_MBR
or 'syslinux'). or 'syslinux').
config BR2_TARGET_SYSLINUX_EFI config BR2_TARGET_SYSLINUX_EFI
bool "efi" bool "install efi"
select BR2_PACKAGE_GNU_EFI select BR2_PACKAGE_GNU_EFI
help help
Install the 'efi' image, to boot from an EFI environment. Install the 'efi' image, to boot from an EFI environment.
endchoice
if BR2_TARGET_SYSLINUX_LEGACY_BIOS if BR2_TARGET_SYSLINUX_LEGACY_BIOS

4
boot/syslinux/syslinux.mk
View File

@ -16,7 +16,7 @@ SYSLINUX_INSTALL_IMAGES = YES
SYSLINUX_DEPENDENCIES = host-nasm host-util-linux host-upx SYSLINUX_DEPENDENCIES = host-nasm host-util-linux host-upx
ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y) ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y)
SYSLINUX_TARGET = bios SYSLINUX_TARGET += bios
endif endif
# The syslinux build system must be forced to use Buildroot's gnu-efi # The syslinux build system must be forced to use Buildroot's gnu-efi
@ -30,7 +30,7 @@ else
SYSLINUX_EFI_BITS = efi32 SYSLINUX_EFI_BITS = efi32
endif # 64-bit endif # 64-bit
SYSLINUX_DEPENDENCIES += gnu-efi SYSLINUX_DEPENDENCIES += gnu-efi
SYSLINUX_TARGET = $(SYSLINUX_EFI_BITS) SYSLINUX_TARGET += $(SYSLINUX_EFI_BITS)
SYSLINUX_EFI_ARGS = \ SYSLINUX_EFI_ARGS = \
EFIINC=$(STAGING_DIR)/usr/include/efi \ EFIINC=$(STAGING_DIR)/usr/include/efi \
LIBDIR=$(STAGING_DIR)/usr/lib \ LIBDIR=$(STAGING_DIR)/usr/lib \