[Buildroot] [PATCH 1/2] fs/iso9660: fix hybrid image support

[Buildroot] [PATCH 1/2] fs/iso9660: fix hybrid image support

[Noé Rubinstein]

*_POST_GEN_HOOKS was never merged.

Suggested by Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Signed-off-by: No? Rubinstein <nrubinstein@aldebaran.com>
---
 fs/iso9660/iso9660.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index d836194..9100547 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -146,15 +146,14 @@ endif # ROOTFS_ISO9660_USE_INITRD
 define ROOTFS_ISO9660_CMD
 	$(HOST_DIR)/usr/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
-		-o $@ $(ROOTFS_ISO9660_TARGET_DIR)
+		-o $@ $(ROOTFS_ISO9660_TARGET_DIR) \
+	$(if $(ROOTFS_ISO9660_GEN_HYBRID), && $(ROOTFS_ISO9660_GEN_HYBRID))
 endef
 
 ifeq ($(BR2_TARGET_ROOTFS_ISO9660_HYBRID),y)
 define ROOTFS_ISO9660_GEN_HYBRID
 	$(HOST_DIR)/usr/bin/isohybrid -t 0x96 $@
 endef
-
-ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_GEN_HYBRID
 endif
 
 $(eval $(call ROOTFS_TARGET,iso9660))
-- 
2.1.4

[Buildroot] [PATCH 2/2] fs/iso9660: install Isolinux comboot modules

[Noé Rubinstein]

This installs every module selected by the BR2_TARGET_SYSLINUX_C32.
This is useful when using a custom Isolinux configuration file that may use
comboot modules.

Signed-off-by: No? Rubinstein <nrubinstein@aldebaran.com>
---
 fs/iso9660/iso9660.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 9100547..cdafd4c 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -68,8 +68,8 @@ ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
 	$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/isolinux.cfg
 ROOTFS_ISO9660_BOOT_IMAGE = isolinux/isolinux.bin
 define ROOTFS_ISO9660_INSTALL_BOOTLOADER
-	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/syslinux/isolinux.bin \
-		$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/isolinux.bin
+	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/syslinux/* \
+		$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/
 	$(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/syslinux/ldlinux.c32 \
 		$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ldlinux.c32
 endef
-- 
2.1.4

[Buildroot] [PATCH 1/2] fs/iso9660: fix hybrid image support

[Thomas Petazzoni]

Hello,

On Thu, 30 Jul 2015 16:47:30 +0200, No? Rubinstein wrote:

> diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
> index d836194..9100547 100644
> --- a/fs/iso9660/iso9660.mk
> +++ b/fs/iso9660/iso9660.mk
> @@ -146,15 +146,14 @@ endif # ROOTFS_ISO9660_USE_INITRD
>  define ROOTFS_ISO9660_CMD
>  	$(HOST_DIR)/usr/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
>  		-no-emul-boot -boot-load-size 4 -boot-info-table \
> -		-o $@ $(ROOTFS_ISO9660_TARGET_DIR)
> +		-o $@ $(ROOTFS_ISO9660_TARGET_DIR) \
> +	$(if $(ROOTFS_ISO9660_GEN_HYBRID), && $(ROOTFS_ISO9660_GEN_HYBRID))

Can you resubmit with the && thing ? It is not needed: make will
abort automatically if genisoimage fails.

Thanks,

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

[Buildroot] [PATCH 1/2] fs/iso9660: fix hybrid image support

[Noé Rubinstein]

On Thu, Jul 30, 2015 at 4:50 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Can you resubmit with the && thing ? It is not needed: make will
> abort automatically if genisoimage fails.

The issue is syntactic: ROOTFS_ISO9660_CMD is used in this line in common.mk:

    echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)

Therefore it can not contain any newline. This would be fixed by using
the file function in GNU make
<https://www.gnu.org/software/make/manual/html_node/File-Function.html>
but it would not work with GNU make 3.81.
-- 
No? Rubinstein.

[Buildroot] [PATCH 1/2] fs/iso9660: fix hybrid image support

[Thomas Petazzoni]

Dear No? Rubinstein,

On Thu, 30 Jul 2015 16:56:34 +0200, No? Rubinstein wrote:
> On Thu, Jul 30, 2015 at 4:50 PM, Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> wrote:
> > Can you resubmit with the && thing ? It is not needed: make will
> > abort automatically if genisoimage fails.
> 
> The issue is syntactic: ROOTFS_ISO9660_CMD is used in this line in common.mk:
> 
>     echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
> 
> Therefore it can not contain any newline. This would be fixed by using
> the file function in GNU make
> <https://www.gnu.org/software/make/manual/html_node/File-Function.html>
> but it would not work with GNU make 3.81.

Hum then maybe in the end my _POST_GEN_HOOKS idea is better?

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

[Buildroot] [PATCH 1/2] fs/iso9660: fix hybrid image support

[Noé Rubinstein]

> Hum then maybe in the end my _POST_GEN_HOOKS idea is better?

Would you prefer something like:

>  define ROOTFS_ISO9660_CMD
>         $(HOST_DIR)/usr/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
>                 -no-emul-boot -boot-load-size 4 -boot-info-table \
> -               -o $@ $(ROOTFS_ISO9660_TARGET_DIR)
> +               -o $@ $(ROOTFS_ISO9660_TARGET_DIR) ; \
> +       $(ROOTFS_ISO9660_GEN_HYBRID)
>  endef

--
No? Rubinstein

[Buildroot] [PATCH 1/2] fs/iso9660: fix hybrid image support

[Yann E. MORIN]

Thomas, All,

On 2015-07-30 17:03 +0200, Thomas Petazzoni spake thusly:
> On Thu, 30 Jul 2015 16:56:34 +0200, No? Rubinstein wrote:
> > On Thu, Jul 30, 2015 at 4:50 PM, Thomas Petazzoni
> > <thomas.petazzoni@free-electrons.com> wrote:
> > > Can you resubmit with the && thing ? It is not needed: make will
> > > abort automatically if genisoimage fails.
> > 
> > The issue is syntactic: ROOTFS_ISO9660_CMD is used in this line in common.mk:
> > 
> >     echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
> > 
> > Therefore it can not contain any newline. This would be fixed by using
> > the file function in GNU make
> > <https://www.gnu.org/software/make/manual/html_node/File-Function.html>
> > but it would not work with GNU make 3.81.
> 
> Hum then maybe in the end my _POST_GEN_HOOKS idea is better?

Yes, that would make it symetrical with the existing _PRE_GEN hooks.

No?, would you care to implement this post-gen hooks and resubmit using
that, please?

Thanks! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 2/2] fs/iso9660: install Isolinux comboot modules

[Yann E. MORIN]

No?, All,

On 2015-07-30 16:47 +0200, No? Rubinstein spake thusly:
> This installs every module selected by the BR2_TARGET_SYSLINUX_C32.
> This is useful when using a custom Isolinux configuration file that may use
> comboot modules.
> 
> Signed-off-by: No? Rubinstein <nrubinstein@aldebaran.com>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  fs/iso9660/iso9660.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
> index 9100547..cdafd4c 100644
> --- a/fs/iso9660/iso9660.mk
> +++ b/fs/iso9660/iso9660.mk
> @@ -68,8 +68,8 @@ ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
>  	$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/isolinux.cfg
>  ROOTFS_ISO9660_BOOT_IMAGE = isolinux/isolinux.bin
>  define ROOTFS_ISO9660_INSTALL_BOOTLOADER
> -	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/syslinux/isolinux.bin \
> -		$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/isolinux.bin
> +	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/syslinux/* \
> +		$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/
>  	$(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/syslinux/ldlinux.c32 \
>  		$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ldlinux.c32
>  endef
> -- 
> 2.1.4
> 
> _______________________________________________
> 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 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 2/2] fs/iso9660: install Isolinux comboot modules

[Thomas Petazzoni]

Dear No? Rubinstein,

On Thu, 30 Jul 2015 16:47:31 +0200, No? Rubinstein wrote:
> This installs every module selected by the BR2_TARGET_SYSLINUX_C32.
> This is useful when using a custom Isolinux configuration file that may use
> comboot modules.
> 
> Signed-off-by: No? Rubinstein <nrubinstein@aldebaran.com>
> ---
>  fs/iso9660/iso9660.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

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