Skip to contentSkip to conversation

fs/iso9660: fix hybrid image support

PATCH New Noé Rubinstein 3 participants 9 messages Jul 30, 2015

lore
Share & tools
lore

Noé Rubinstein

author
#0 lore raw

PATCH 1/2 fs/iso9660: fix hybrid image support

*_POST_GEN_HOOKS was never merged.

Suggested by Thomas Petazzoni <[email protected]>

Signed-off-by No? Rubinstein <[email protected]>
---
 fs/iso9660/iso9660.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
fs/iso9660/iso9660.mk +2 -3
index d836194..9100547 100644
@@ -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))
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 2/2 fs/iso9660: install Isolinux comboot modules

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 <[email protected]>
---
 fs/iso9660/iso9660.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/iso9660/iso9660.mk +2 -2
index 9100547..cdafd4c 100644
@@ -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
Signature · 1 line
2.1.4
#2 lore raw

PATCH 2/2 fs/iso9660: install Isolinux comboot modules

No?, All,

On 2015-07-30 16:47 +0200, No? Rubinstein spake thusly:

Quoted 5 lines

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 <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 26 lines
---
 fs/iso9660/iso9660.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/iso9660/iso9660.mk +2 -2
index 9100547..cdafd4c 100644
@@ -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
Signature · 6 lines
2.1.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
Applied
#3 lore raw

PATCH 2/2 fs/iso9660: install Isolinux comboot modules

In reply to Noé Rubinstein

Dear No? Rubinstein,

Quoted 8 lines · 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 <[email protected]>
---
 fs/iso9660/iso9660.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH 1/2 fs/iso9660: fix hybrid image support

In reply to Noé Rubinstein

Hello,

fs/iso9660/iso9660.mk endif # ROOTFS_ISO9660_USE_INITRD · line 150

Quoted 11 lines · No? Rubinstein
fs/iso9660/iso9660.mk +2 -1
index d836194..9100547 100644
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#5 lore raw

PATCH 1/2 fs/iso9660: fix hybrid image support

Quoted 2 lines · Thomas Petazzoni

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.

Signature · 1 line
No? Rubinstein.
#6 lore raw

PATCH 1/2 fs/iso9660: fix hybrid image support

Dear No? Rubinstein,

Quoted 5 lines · No? Rubinstein
Quoted 2 lines · Thomas Petazzoni

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

Quoted 8 lines

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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#7 lore raw

PATCH 1/2 fs/iso9660: fix hybrid image support

Quoted 1 line

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

Would you prefer something like:

fs/iso9660/iso9660.mk endif # ROOTFS_ISO9660_USE_INITRD · line 151

Quoted 7 lines

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 \
fs/iso9660/iso9660.mk +2 -1
-               -o $@ $(ROOTFS_ISO9660_TARGET_DIR)
+               -o $@ $(ROOTFS_ISO9660_TARGET_DIR) ; \
+       $(ROOTFS_ISO9660_GEN_HYBRID)
 endef

--
No? Rubinstein

#8 lore raw

PATCH 1/2 fs/iso9660: fix hybrid image support

In reply to Thomas Petazzoni

Thomas, All,

On 2015-07-30 17:03 +0200, Thomas Petazzoni spake thusly:

Quoted 8 lines · No? Rubinstein
Quoted 7 lines
Quoted 2 lines · Thomas Petazzoni

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:

Quoted 8 lines
Quoted 6 lines
    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.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'