[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Benoît Allard]

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>
---
Changed v1 -> v2
  - Always select at least isolinux (Suggested by Arnoud and Thomas)
  - Update the labels to read "install xxx"
---
 boot/syslinux/Config.in   | 17 +++++++++--------
 boot/syslinux/syslinux.mk |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

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

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Matthew Weber]

Benoit,

On Thu, Mar 17, 2016 at 3:09 AM, Beno?t Allard
<benoit.allard@greenbone.net> 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@greenbone.net>

I built a qemu x86 target and verified that after selecting both iso
and mbr they were installed.  This update will come in handy on at
least one of my projects where we build two types of media sets from
the output and need iso/mbr options without creating separate builds
or a post image script that extracts the other bin file from the
build/syslinux folder.

Tested-by Matt Weber <matt@thewebers.ws>
Reviewed-by Matt Weber <matt@thewebers.ws>

-- 
Thanks,
Matt

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Matthew Weber]

Benoit,

On Fri, Apr 1, 2016 at 11:59 PM, Matthew Weber <matt@thewebers.ws> wrote:
> Benoit,
>
> On Thu, Mar 17, 2016 at 3:09 AM, Beno?t Allard
> <benoit.allard@greenbone.net> 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@greenbone.net>
>
> I built a qemu x86 target and verified that after selecting both iso
> and mbr they were installed.  This update will come in handy on at
> least one of my projects where we build two types of media sets from
> the output and need iso/mbr options without creating separate builds
> or a post image script that extracts the other bin file from the
> build/syslinux folder.
>
> Tested-by Matt Weber <matt@thewebers.ws>
> Reviewed-by Matt Weber <matt@thewebers.ws>
>
> --
> Thanks,
> Matt

Doesn't look like patchworks is tracking this revision of the patch.
Maybe send as a version 2?
(end of section 21.5.4)
https://buildroot.org/downloads/manual/manual.html#submitting-patches

-- 
Thanks,
Matt

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Benoît Allard]

All, 

On Sat, 2 Apr 2016 08:05:21 -0500
Matthew Weber <matt@thewebers.ws> wrote:

> Benoit,
> 
> On Fri, Apr 1, 2016 at 11:59 PM, Matthew Weber <matt@thewebers.ws>
> wrote:
> > Benoit,
> >
> > On Thu, Mar 17, 2016 at 3:09 AM, Beno?t Allard
> > <benoit.allard@greenbone.net> 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@greenbone.net>
> >
> > I built a qemu x86 target and verified that after selecting both iso
> > and mbr they were installed.  This update will come in handy on at
> > least one of my projects where we build two types of media sets from
> > the output and need iso/mbr options without creating separate builds
> > or a post image script that extracts the other bin file from the
> > build/syslinux folder.
> >
> > Tested-by Matt Weber <matt@thewebers.ws>
> > Reviewed-by Matt Weber <matt@thewebers.ws>
> >
> > --
> > Thanks,
> > Matt
> 
> Doesn't look like patchworks is tracking this revision of the patch.
> Maybe send as a version 2?
> (end of section 21.5.4)
> https://buildroot.org/downloads/manual/manual.html#submitting-patches
> 

At this point, I'm not sure what action is needed from me to make
progress on that. Are we just all set, and waiting for more review /
integration, or is some kind of patchwork-magic expected from me there ?

Regards,
Ben
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160408/52d65452/attachment.asc>

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Arnout Vandecappelle]

On 04/08/16 09:49, Beno?t Allard wrote:
> All,
>
> On Sat, 2 Apr 2016 08:05:21 -0500
> Matthew Weber <matt@thewebers.ws> wrote:
>
>> Benoit,
>>
>> On Fri, Apr 1, 2016 at 11:59 PM, Matthew Weber <matt@thewebers.ws>
>> wrote:
>>> Benoit,
>>>
>>> On Thu, Mar 17, 2016 at 3:09 AM, Beno?t Allard
>>> <benoit.allard@greenbone.net> 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@greenbone.net>
>>>
>>> I built a qemu x86 target and verified that after selecting both iso
>>> and mbr they were installed.  This update will come in handy on at
>>> least one of my projects where we build two types of media sets from
>>> the output and need iso/mbr options without creating separate builds
>>> or a post image script that extracts the other bin file from the
>>> build/syslinux folder.
>>>
>>> Tested-by Matt Weber <matt@thewebers.ws>
>>> Reviewed-by Matt Weber <matt@thewebers.ws>
>>>
>>> --
>>> Thanks,
>>> Matt
>>
>> Doesn't look like patchworks is tracking this revision of the patch.
>> Maybe send as a version 2?
>> (end of section 21.5.4)
>> https://buildroot.org/downloads/manual/manual.html#submitting-patches
>>
>
> At this point, I'm not sure what action is needed from me to make
> progress on that. Are we just all set, and waiting for more review /
> integration, or is some kind of patchwork-magic expected from me there ?

  You don't need to do anything, Matt just forgot to add the : in his tags. I'll 
add them here:

Tested-by: Matt Weber <matt@thewebers.ws>
Reviewed-by: Matt Weber <matt@thewebers.ws>


  Regards,
  Arnout

-- 
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

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Arnout Vandecappelle]

On 03/17/16 09:09, 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@greenbone.net>
> ---
> Changed v1 -> v2
>    - Always select at least isolinux (Suggested by Arnoud and Thomas)
>    - Update the labels to read "install xxx"
> ---
>   boot/syslinux/Config.in   | 17 +++++++++--------
>   boot/syslinux/syslinux.mk |  4 ++--
>   2 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
> index f4b9870..5705d8f 100644
> --- a/boot/syslinux/Config.in
> +++ b/boot/syslinux/Config.in
> @@ -2,6 +2,11 @@ config BR2_TARGET_SYSLINUX
>   	bool "syslinux"
>   	depends on BR2_i386 || BR2_x86_64
>   	select BR2_HOSTARCH_NEEDS_IA32_COMPILER
> +	# Make sure at least one of the flavor is installed

  flavor -> flavors

  Otherwise looks good so
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


  Regards,
  Arnout

> +	select BR2_TARGET_SYSLINUX_ISOLINUX \
> +		if !BR2_TARGET_SYSLINUX_PXELINUX && \
> +		   !BR2_TARGET_SYSLINUX_MBR && \
> +		   !BR2_TARGET_SYSLINUX_EFI
>   	help
>   	  The syslinux bootloader for x86 systems.
>   	  This includes: syslinux, pxelinux, extlinux.
> @@ -13,25 +18,22 @@ if BR2_TARGET_SYSLINUX
>   config BR2_TARGET_SYSLINUX_LEGACY_BIOS
>   	bool
>
> -choice
> -	bool "Image to install"
> -
>   config BR2_TARGET_SYSLINUX_ISOLINUX
> -	bool "isolinux"
> +	bool "install isolinux"
>   	select BR2_TARGET_SYSLINUX_LEGACY_BIOS
>   	help
>   	  Install the legacy-BIOS 'isolinux' image, to boot off
>   	  optical media (CDROM, DVD.)
>
>   config BR2_TARGET_SYSLINUX_PXELINUX
> -	bool "pxelinux"
> +	bool "install pxelinux"
>   	select BR2_TARGET_SYSLINUX_LEGACY_BIOS
>   	help
>   	  Install the legacy-BIOS 'pxelinux' image, to boot off
>   	  the network using PXE.
>
>   config BR2_TARGET_SYSLINUX_MBR
> -	bool "mbr"
> +	bool "install mbr"
>   	select BR2_TARGET_SYSLINUX_LEGACY_BIOS
>   	help
>   	  Install the legacy-BIOS 'mbr' image, to boot off a
> @@ -39,12 +41,11 @@ config BR2_TARGET_SYSLINUX_MBR
>   	  or 'syslinux').
>
>   config BR2_TARGET_SYSLINUX_EFI
> -	bool "efi"
> +	bool "install efi"
>   	select BR2_PACKAGE_GNU_EFI
>   	help
>   	  Install the 'efi' image, to boot from an EFI environment.
>
> -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

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Thomas Petazzoni]

Hello,

On Thu, 17 Mar 2016 09:09:16 +0100, 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@greenbone.net>
> ---
> Changed v1 -> v2
>   - Always select at least isolinux (Suggested by Arnoud and Thomas)
>   - Update the labels to read "install xxx"
> ---
>  boot/syslinux/Config.in   | 17 +++++++++--------
>  boot/syslinux/syslinux.mk |  4 ++--
>  2 files changed, 11 insertions(+), 10 deletions(-)

I've fixed the small typo noticed by Arnout and applied, thanks! Thanks
to Matt and Arnout for testing/reviewing!

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Thomas Petazzoni]

Hello,

On Wed, 16 Mar 2016 22:31:18 +0100, Arnout Vandecappelle wrote:

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

Ensure in Config.in that one of them is enabled, like in the main
option:

	select BR2_TARGET_SYSLINUX_ISOLINUX \
		if !BR2_TARGET_SYSLINUX_PXELINUX && \
		   !BR2_TARGET_SYSLINUX_MBR && \
		   !BR2_TARGET_SYSLINUX_EFI

At least, that's my preference.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Arnout Vandecappelle]

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@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

[Buildroot] [PATCH 1/1] syslinux: Allow to build multiple flavors simultaneously

[Benoît Allard]

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>
---
 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"
@@ -44,7 +42,6 @@ config BR2_TARGET_SYSLINUX_EFI
 	help
 	  Install the 'efi' image, to boot from an EFI environment.
 
-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 \
-- 
2.1.4