iso9660 support improvements

The common filesystem infrastructure already supports a <fs>_PRE_GEN_HOOKS variable, which allows filesystem makefiles to register some actions to be done before the root filesystem image is generated.

This commit adds a similiar <fs>_POST_GEN_HOOKS variable, which will allow filesystem makefiles to do some actions after the filesystem image has been generated. It will initially be used by the iso9660 filesystem to delete the temporary directory it creates.

Signed-off-by Thomas Petazzoni <[email protected]>

The common filesystem infrastructure already supports a <fs>_PRE_GEN_HOOKS variable, which allows filesystem makefiles to register some actions to be done before the root filesystem image is generated.

This commit adds a similiar <fs>_POST_GEN_HOOKS variable, which will allow filesystem makefiles to do some actions after the filesystem image has been generated. It will initially be used by the iso9660 filesystem to delete the temporary directory it creates.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/common.mk | 4 ++++
 1 file changed, 4 insertions(+)

fs/common.mk +4 -0

index 4387d06..40389bd 100644
@@ -16,6 +16,9 @@
 #  ROOTFS_$(FSTYPE)_PRE_GEN_HOOKS, a list of hooks to call before
 #  generating the filesystem image
 #
+#  ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after
+#  generating the filesystem image
+#
 #  ROOTFS_$(FSTYPE)_POST_TARGETS, the list of targets that should be
 #  run after running the main filesystem target. This is useful for
 #  initramfs, to rebuild the kernel once the initramfs is generated.

@@ -96,6 +99,7 @@ endif
 ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),)
 	PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT)
 endif
+	$$(foreach hook,$$(ROOTFS_$(2)_POST_GEN_HOOKS),$$(call $$(hook))$$(sep))
 
 rootfs-$(1)-show-depends:
 	@echo $$(ROOTFS_$(2)_DEPENDENCIES)

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Now that we have <fs>_POST_GEN_HOOKS, there is nothing that prevents the iso9660 filesystem logic from using the common filesystem infrastructure.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/iso9660/iso9660.mk | 64 +++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

fs/iso9660/iso9660.mk +18 -22

index 4ccfce9..5a29673 100644
@@ -2,9 +2,6 @@
 #
 # Build the iso96600 root filesystem image
 #
-# Cannot be converted to the ROOTFS_TARGET infrastructure, because of
-# the temporary construction in ISO9660_TARGET_DIR.
-#
 ################################################################################
 
 ISO9660_TARGET_DIR = $(BUILD_DIR)/iso9660

@@ -12,49 +9,50 @@ ISO9660_BOOT_MENU := $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
 
 ROOTFS_ISO9660_DEPENDENCIES = grub host-cdrkit host-fakeroot linux rootfs-cpio
 
-$(BINARIES_DIR)/rootfs.iso9660: $(ROOTFS_ISO9660_DEPENDENCIES)
-       @$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
-       $(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
-               $(ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
-       $(INSTALL) -D -m 0644 $(ISO9660_BOOT_MENU) \
-               $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
 ifeq ($(BR2_TARGET_GRUB_SPLASH),)
+define ROOTFS_ISO9660_SPLASHSCREEN
        $(SED) '/^splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+endef
 else
+define ROOTFS_ISO9660_SPLASHSCREEN
        $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \
                $(ISO9660_TARGET_DIR)/splash.xpm.gz
+endef
 endif
-       $(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
+
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+define ROOTFS_ISO9660_INITRD
        $(SED) '/initrd/d'  $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+endef
 else
+define ROOTFS_ISO9660_INITRD
        $(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
                $(ISO9660_TARGET_DIR)/initrd
+endef
 endif
-       # Use fakeroot to pretend all target binaries are owned by root
-       rm -f $(FAKEROOT_SCRIPT)
-       echo "chown -h -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
-       # Use fakeroot so mkisofs believes the previous fakery
-       echo "$(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot " \
-               "-boot-load-size 4 -boot-info-table -o $@ $(ISO9660_TARGET_DIR)" \
-               >> $(FAKEROOT_SCRIPT)
-       chmod a+x $(FAKEROOT_SCRIPT)
-       $(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT)
-       - at rm -f $(FAKEROOT_SCRIPT)
-       - at rm -rf $(ISO9660_TARGET_DIR)
 
-rootfs-iso9660: $(BINARIES_DIR)/rootfs.iso9660
+define ROOTFS_ISO9660_PREPARATION
+       $(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
+               $(ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
+       $(INSTALL) -D -m 0644 $(ISO9660_BOOT_MENU) \
+               $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+       $(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
+       $(ROOTFS_ISO9660_SPLASHSCREEN)
+       $(ROOTFS_ISO9660_INITRD)
+endef

fs/iso9660/iso9660.mk +8 -9

+endef
 
-################################################################################
-#
-# Toplevel Makefile options
-#
-################################################################################
-ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y)
-TARGETS_ROOTFS += rootfs-iso9660
-endif
+define ROOTFS_ISO9660_REMOVE_TEMPDIR
+       $(RM) -rf $(ISO9660_TARGET_DIR)
+endef
+
+ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_REMOVE_TEMPDIR
+
+$(eval $(call ROOTFS_TARGET,iso9660))
--

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

fs/iso9660/iso9660.mk ISO9660_BOOT_MENU := $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU)) · line 49

Quoted 4 lines

fs/iso9660/iso9660.mk +4 -0

+define ROOTFS_ISO9660_CMD
+       $(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito \
+               -no-emul-boot -boot-load-size 4 -boot-info-table \
+               -o $@ $(ISO9660_TARGET_DIR)

Why the fakeroot trickery on genisoimage call is gone? or why is it not needed anymore?

Now that we have <fs>_POST_GEN_HOOKS, there is nothing that prevents the iso9660 filesystem logic from using the common filesystem infrastructure.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/iso9660/iso9660.mk | 64 +++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

fs/iso9660/iso9660.mk +0 -3

index 4ccfce9..5a29673 100644
@@ -2,9 +2,6 @@
 #
 # Build the iso96600 root filesystem image
 #
-# Cannot be converted to the ROOTFS_TARGET infrastructure, because of
-# the temporary construction in ISO9660_TARGET_DIR.
-#
 ################################################################################
 
 ISO9660_TARGET_DIR = $(BUILD_DIR)/iso9660

fs/iso9660/iso9660.mk +31 -24

+define ROOTFS_ISO9660_SPLASHSCREEN
 	$(SED) '/^splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+endef
 else
+define ROOTFS_ISO9660_SPLASHSCREEN
 	$(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \
 		$(ISO9660_TARGET_DIR)/splash.xpm.gz
+endef
 endif
-	$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
+
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+define ROOTFS_ISO9660_INITRD
 	$(SED) '/initrd/d'  $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+endef
 else
+define ROOTFS_ISO9660_INITRD
 	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
 		$(ISO9660_TARGET_DIR)/initrd
+endef
 endif
-	# Use fakeroot to pretend all target binaries are owned by root
-	rm -f $(FAKEROOT_SCRIPT)
-	echo "chown -h -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
-	# Use fakeroot so mkisofs believes the previous fakery
-	echo "$(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot " \
-		"-boot-load-size 4 -boot-info-table -o $@ $(ISO9660_TARGET_DIR)" \
-		>> $(FAKEROOT_SCRIPT)
-	chmod a+x $(FAKEROOT_SCRIPT)
-	$(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT)
-	- at rm -f $(FAKEROOT_SCRIPT)
-	- at rm -rf $(ISO9660_TARGET_DIR)
 
-rootfs-iso9660: $(BINARIES_DIR)/rootfs.iso9660
+define ROOTFS_ISO9660_PREPARATION
+	$(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
+		$(ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
+	$(INSTALL) -D -m 0644 $(ISO9660_BOOT_MENU) \
+		$(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
+	$(ROOTFS_ISO9660_SPLASHSCREEN)
+	$(ROOTFS_ISO9660_INITRD)
+endef
 
-rootfs-iso9660-show-depends:
-	@echo $(ROOTFS_ISO9660_DEPENDENCIES)
+ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_PREPARATION
 
-.PHONY: rootfs-iso9660 rootfs-iso9660-show-depends
+define ROOTFS_ISO9660_CMD
+	$(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito \
+		-no-emul-boot -boot-load-size 4 -boot-info-table \
+		-o $@ $(ISO9660_TARGET_DIR)
+endef
 
-################################################################################
-#
-# Toplevel Makefile options
-#
-################################################################################
-ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y)
-TARGETS_ROOTFS += rootfs-iso9660
-endif
+define ROOTFS_ISO9660_REMOVE_TEMPDIR
+	$(RM) -rf $(ISO9660_TARGET_DIR)
+endef
+
+ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_REMOVE_TEMPDIR
+
+$(eval $(call ROOTFS_TARGET,iso9660))

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

ifeq ($(BR2_TARGET_GRUB_SPLASH),)

I know this was pre-existing code, but we usually prefer positive logic. Do you think you might arrange to fix the logic in this test with anotehr patch? ;-)

Quoted 6 lines

Quoted 2 lines

ifeq ($(BR2_TARGET_GRUB_SPLASH),)

I know this was pre-existing code, but we usually prefer positive logic. Do you think you might arrange to fix the logic in this test with anotehr patch? ;-)

Isn't that already positive logic?

"if BR2_TARGET_GRUB_SPLASH is disabled"

The other solution is:

ifneq ($(BR2_TARGET_GRUB_SPLASH),y)

which is "if not BR2_TARGET_GRUB_SPLASH is enabled"

which looks worse.

Am I missing something?

Well, sorry, I was not completely explicit. What I meant was:

    ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
    define ROOTFS_ISO9660_SPLASHSCREEN
        $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \
            $(ISO9660_TARGET_DIR)/splash.xpm.gz
    endef
    else
    define ROOTFS_ISO9660_SPLASHSCREEN
        $(SED) '/^splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
    endef
    endif

Quoted 12 lines

Well, sorry, I was not completely explicit. What I meant was:

    ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
    define ROOTFS_ISO9660_SPLASHSCREEN
        $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \
            $(ISO9660_TARGET_DIR)/splash.xpm.gz
    endef
    else
    define ROOTFS_ISO9660_SPLASHSCREEN
        $(SED) '/^splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
    endef
    endif

Yes, but no.

The $(SED) '/^splashimage/d' case needs to be done in all cases if BR2_TARGET_GRUB_SPLASH is disabled (regardless whether we're using initrd/initramfs or a real iso9660 for the rootfs).

However, the $(INSTALL) needs to be done only if BR2_TARGET_GRUB_SPLASH=y *and* we are using an initrd/initramfs, not if we are using directly the rootfs in the iso9660 filesystem. So this part only needs to be done if BR2_TARGET_GRUB_SPLASH=y *and* ROOTFS_ISO9660_USE_INITRD=YES.

Now that we have <fs>_POST_GEN_HOOKS, there is nothing that prevents the iso9660 filesystem logic from using the common filesystem infrastructure.

Signed-off-by Thomas Petazzoni <[email protected]>

Quoted 4 lines · Thomas Petazzoni

Now that we have <fs>_POST_GEN_HOOKS, there is nothing that prevents the iso9660 filesystem logic from using the common filesystem infrastructure.

Quoted 1 line

Signed-off-by Thomas Petazzoni <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

However, instead of doing the cleanup in a _POST_GEN_HOOK, I would skip the
cleanup completely. We normally don't clean up any build artefact, so why should we do it here?

Dear Arnout Vandecappelle,

Quoted 9 lines · Arnout Vandecappelle

Quoted 5 lines · Thomas Petazzoni

Now that we have <fs>_POST_GEN_HOOKS, there is nothing that prevents the iso9660 filesystem logic from using the common filesystem infrastructure.

Signed-off-by Thomas Petazzoni <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Quoted 3 lines

However, instead of doing the cleanup in a _POST_GEN_HOOK, I would skip the
cleanup completely. We normally don't clean up any build artefact, so why should we do it here?

That's actually true. The only advantage by cleaning up is that if you redo a build and the contents of the temporary directory have changed, it's properly accurate.

But we could also do:

remove temp dir
create empty temp dir
do stuff
create image

and that's it.

Do you want to change it in this direction?

In preparation to the addition of numerous additional options to the iso9660 filesystem logic, use a if ... endif block instead of a depends on for the only option that currently exists.

Signed-off-by Thomas Petazzoni <[email protected]>

In preparation to the addition of numerous additional options to the iso9660 filesystem logic, use a if ... endif block instead of a depends on for the only option that currently exists.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/iso9660/Config.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

fs/iso9660/Config.in +4 -1

index 50b4377..9d00ab8 100644
@@ -8,11 +8,14 @@ config BR2_TARGET_ROOTFS_ISO9660
 	help
 	  Build a bootable iso9660 image
 
+if BR2_TARGET_ROOTFS_ISO9660
+
 config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
 	string "Boot menu.lst file"
-	depends on BR2_TARGET_ROOTFS_ISO9660
 	default "fs/iso9660/menu.lst"
 
+endif
+
 comment "iso image needs a Linux kernel to be built"
 	depends on BR2_i386 || BR2_x86_64
 	depends on !BR2_LINUX_KERNEL

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

We already enable the Rockridge extension by default when building ISO9660, so let's also enable the Joliet extension which allows to support Unicode file names and long file names.

Signed-off-by Thomas Petazzoni <[email protected]>

We already enable the Rockridge extension by default when building ISO9660, so let's also enable the Joliet extension which allows to support Unicode file names and long file names.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/iso9660/iso9660.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

fs/iso9660/iso9660.mk +0 -0

index 5a29673..6a04fe6 100644

fs/iso9660/iso9660.mk +0 -0

 		-no-emul-boot -boot-load-size 4 -boot-info-table \
 		-o $@ $(ISO9660_TARGET_DIR)
 endef

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Only tangentially related to your change:

-R is for RockRidge, but it seems using -r would be better:

-r This is like the -R option, but file ownership and modes are set
to more useful values. [--snip--]

Reading the full entry for -r is instructive, and makes it sound like that's what we would want to use instead of -R.

Quoted 10 lines

Only tangentially related to your change:

-R is for RockRidge, but it seems using -r would be better:

-r This is like the -R option, but file ownership and modes are set
to more useful values. [--snip--]

Reading the full entry for -r is instructive, and makes it sound like that's what we would want to use instead of -R.

I'm actually not sure. Let's list what -r is doing compared to -R:

* Setting uid:gid to 0:0 to all files. We already do that using fakeroot, and we also set some other ownership for specific files using <pkg>_PERMISSIONS and the device table. So getting all of that reset to 0:0 is wrong.

* Changing permissions all over. Why do we care? We already take care of dependencies, and -r makes everything world-readable, which we clearly don't want.

* It apparently clears the set-id bit, which would make all setuid application to break.

So, in fact I'm rather convinced that we should keep -R and not use -r.

For consistency reasons, this commit renames all internal variables of iso9660.mk to use the ROOTFS_ISO9660 prefix.

While we're at it, replace a useless ':=' by '='.

Signed-off-by Thomas Petazzoni <[email protected]>

For consistency reasons, this commit renames all internal variables of iso9660.mk to use the ROOTFS_ISO9660 prefix.

While we're at it, replace a useless ':=' by '='.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/iso9660/iso9660.mk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

fs/iso9660/iso9660.mk +12 -12

index 6a04fe6..0c7ef3b 100644
@@ -4,39 +4,39 @@
 #
 ################################################################################
 
-ISO9660_TARGET_DIR = $(BUILD_DIR)/iso9660
-ISO9660_BOOT_MENU := $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
+ROOTFS_ISO9660_TARGET_DIR = $(BUILD_DIR)/iso9660
+ROOTFS_ISO9660_BOOT_MENU = $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
 
 ROOTFS_ISO9660_DEPENDENCIES = grub host-cdrkit host-fakeroot linux rootfs-cpio
 
 ifeq ($(BR2_TARGET_GRUB_SPLASH),)
 define ROOTFS_ISO9660_SPLASHSCREEN
-	$(SED) '/^splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	$(SED) '/^splashimage/d' $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 endef
 else
 define ROOTFS_ISO9660_SPLASHSCREEN
 	$(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \
-		$(ISO9660_TARGET_DIR)/splash.xpm.gz
+		$(ROOTFS_ISO9660_TARGET_DIR)/splash.xpm.gz
 endef
 endif
 
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
 define ROOTFS_ISO9660_INITRD
-	$(SED) '/initrd/d'  $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	$(SED) '/initrd/d'  $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 endef
 else
 define ROOTFS_ISO9660_INITRD
 	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
-		$(ISO9660_TARGET_DIR)/initrd
+		$(ROOTFS_ISO9660_TARGET_DIR)/initrd
 endef
 endif
 
 define ROOTFS_ISO9660_PREPARATION
 	$(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
-		$(ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
-	$(INSTALL) -D -m 0644 $(ISO9660_BOOT_MENU) \
-		$(ISO9660_TARGET_DIR)/boot/grub/menu.lst
-	$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
+	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_BOOT_MENU) \
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ROOTFS_ISO9660_TARGET_DIR)/kernel
 	$(ROOTFS_ISO9660_SPLASHSCREEN)
 	$(ROOTFS_ISO9660_INITRD)
 endef

@@ -46,11 +46,11 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_PREPARATION
 define ROOTFS_ISO9660_CMD
 	$(HOST_DIR)/usr/bin/genisoimage -J -R -b boot/grub/stage2_eltorito \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
-		-o $@ $(ISO9660_TARGET_DIR)
+		-o $@ $(ROOTFS_ISO9660_TARGET_DIR)
 endef
 
 define ROOTFS_ISO9660_REMOVE_TEMPDIR
-	$(RM) -rf $(ISO9660_TARGET_DIR)
+	$(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
 endef
 
 ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_REMOVE_TEMPDIR

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

In order to simplify the introduction of the support for using ISO9660 as the real root filesystem, this commit changes the location of the grub splash image. This makes it match where the splash image in $(TARGET_DIR).

Signed-off-by Thomas Petazzoni <[email protected]>

In order to simplify the introduction of the support for using ISO9660 as the real root filesystem, this commit changes the location of the grub splash image. This makes it match where the splash image in $(TARGET_DIR).

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/iso9660/iso9660.mk | 2 +-
 fs/iso9660/menu.lst   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

fs/iso9660/iso9660.mk +0 -0

index 0c7ef3b..80971d3 100644

fs/iso9660/iso9660.mk +0 -0

 endef
 endif
 

fs/iso9660/menu.lst +1 -1

index c0bbff6..fd5c76a 100644
@@ -5,7 +5,7 @@ timeout		10
 color 		cyan/blue white/blue
 
 # Gets enabled/disabled depending on Grub support for splashimage
-splashimage	/splash.xpm.gz
+splashimage	/boot/grub/splash.xpm.gz
 
 # Used when a splashimage is enabled
 foreground 	000000

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

The iso9660.mk modifies the menu.lst file from Grub to set the correct initrd/kernel image locations. However, with the upcoming support of other bootloaders for iso9660 filesystems, we need to modify a bit this logic.

Instead of relying on the specific details of the grub menu.lst syntax, we introduce the __KERNEL_PATH__ and __INITRD_PATH__ magic keywords, which iso9660.mk will replace by the appropriate values. They can therefore be used where needed in grub menu.lst, and in similar configuration files of other bootloaders, as will be supported in the following commits.

Signed-off-by Thomas Petazzoni <[email protected]>

The iso9660.mk modifies the menu.lst file from Grub to set the correct initrd/kernel image locations. However, with the upcoming support of other bootloaders for iso9660 filesystems, we need to modify a bit this logic.

Instead of relying on the specific details of the grub menu.lst syntax, we introduce the __KERNEL_PATH__ and __INITRD_PATH__ magic keywords, which iso9660.mk will replace by the appropriate values. They can therefore be used where needed in grub menu.lst, and in similar configuration files of other bootloaders, as will be supported in the following commits.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/iso9660/Config.in  |  5 +++++
 fs/iso9660/iso9660.mk | 11 ++++++++---
 fs/iso9660/menu.lst   |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

fs/iso9660/Config.in +5 -0

index 9d00ab8..111158b 100644
@@ -13,6 +13,11 @@ if BR2_TARGET_ROOTFS_ISO9660
 config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
 	string "Boot menu.lst file"
 	default "fs/iso9660/menu.lst"
+	help
+	  Use this option to provide a custom Grub menu.lst file. Note
+	  that the strings __KERNEL_PATH__ and __INITRD_PATH__ will
+	  automatically be replaced by the path to the kernel and
+	  initrd images respectively.
 
 endif
 

fs/iso9660/iso9660.mk +8 -3

index 80971d3..2a8a447 100644
@@ -22,12 +22,14 @@ endif
 
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
 define ROOTFS_ISO9660_INITRD
-	$(SED) '/initrd/d'  $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	$(SED) '/__INITRD_PATH__/d'  $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 endef
 else
 define ROOTFS_ISO9660_INITRD
 	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
-		$(ROOTFS_ISO9660_TARGET_DIR)/initrd
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/initrd
+	$(SED) "s%__INITRD_PATH__%/boot/initrd%" \
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 endef
 endif
 

@@ -36,7 +38,10 @@ define ROOTFS_ISO9660_PREPARATION
 		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
 	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_BOOT_MENU) \
 		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
-	$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ROOTFS_ISO9660_TARGET_DIR)/kernel
+	$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) \
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
+	$(SED) "s%__KERNEL_PATH__%/boot/$(LINUX_IMAGE_NAME)%" \
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 	$(ROOTFS_ISO9660_SPLASHSCREEN)
 	$(ROOTFS_ISO9660_INITRD)
 endef

fs/iso9660/menu.lst +2 -2

index fd5c76a..8e8309f 100644
@@ -12,8 +12,8 @@ foreground 	000000
 background 	cccccc
 
 title		Buildroot ISO9660 image
-kernel		/kernel
-initrd		/initrd
+kernel		__KERNEL_PATH__
+initrd		__INITRD_PATH__
 
 title		Hard Drive (first partition)
 rootnoverify	(hd0)

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

The iso9660.mk modifies the menu.lst file from Grub to set the correct initrd/kernel image locations. However, with the upcoming support of other bootloaders for iso9660 filesystems, we need to modify a bit this logic.

Instead of relying on the specific details of the grub menu.lst syntax, we introduce the __KERNEL_PATH__ and __INITRD_PATH__ magic keywords, which iso9660.mk will replace by the appropriate values. They can therefore be used where needed in grub menu.lst, and in similar configuration files of other bootloaders, as will be supported in the following commits.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/iso9660/Config.in  |  5 +++++
 fs/iso9660/iso9660.mk | 11 ++++++++---
 fs/iso9660/menu.lst   |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

fs/iso9660/Config.in +5 -0

index 9d00ab8..111158b 100644
@@ -13,6 +13,11 @@ if BR2_TARGET_ROOTFS_ISO9660
 config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
 	string "Boot menu.lst file"
 	default "fs/iso9660/menu.lst"
+	help
+	  Use this option to provide a custom Grub menu.lst file. Note
+	  that the strings __KERNEL_PATH__ and __INITRD_PATH__ will
+	  automatically be replaced by the path to the kernel and
+	  initrd images respectively.
 
 endif
 

fs/iso9660/iso9660.mk +8 -3

index 80971d3..2a8a447 100644
@@ -22,12 +22,14 @@ endif
 
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
 define ROOTFS_ISO9660_INITRD
-	$(SED) '/initrd/d'  $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	$(SED) '/__INITRD_PATH__/d'  $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 endef
 else
 define ROOTFS_ISO9660_INITRD
 	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
-		$(ROOTFS_ISO9660_TARGET_DIR)/initrd
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/initrd
+	$(SED) "s%__INITRD_PATH__%/boot/initrd%" \
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 endef
 endif
 

@@ -36,7 +38,10 @@ define ROOTFS_ISO9660_PREPARATION
 		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
 	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_BOOT_MENU) \
 		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
-	$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ROOTFS_ISO9660_TARGET_DIR)/kernel
+	$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) \
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
+	$(SED) "s%__KERNEL_PATH__%/boot/$(LINUX_IMAGE_NAME)%" \
+		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 	$(ROOTFS_ISO9660_SPLASHSCREEN)
 	$(ROOTFS_ISO9660_INITRD)
 endef

fs/iso9660/menu.lst +2 -2

index fd5c76a..8e8309f 100644
@@ -12,8 +12,8 @@ foreground 	000000
 background 	cccccc
 
 title		Buildroot ISO9660 image
-kernel		/kernel
-initrd		/initrd
+kernel		__KERNEL_PATH__
+initrd		__INITRD_PATH__
 
 title		Hard Drive (first partition)
 rootnoverify	(hd0)

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Until now, the iso9660 filesystem handling only supported using an initrd/initramfs to store the root filesystem, which is very different from what we do with the other filesystems.

This commit changes the iso9660 logic to also allow using directly an iso9660 filesystem to store the root filesystem. A new option, BR2_TARGET_ROOTFS_ISO9660_INITRD, is created to tell the iso9660 that we want to use an initrd and not directly the root filesystem in iso9660 format. This option defaults to 'y' to preserve the existing behavior.

After this commit, we therefore have three possibilities:

* BR2_TARGET_ROOTFS_ISO9660=y, with BR2_TARGET_ROOTFS_INITRAMFS and BR2_TARGET_ROOTFS_ISO9660_INITRD disabled. In this case, the iso9660 filesystem is directly the contents of the root filesystem (since is possible thanks to the Rockridge extensions that were already enabled using the -R option of genisoimage). Obviously, it means that the root filesystem is read-only.

* BR2_TARGET_ROOTFS_ISO9660=y and BR2_TARGET_ROOTFS_INITRAMFS=y (the value of BR2_TARGET_ROOTFS_ISO9660_INITRD doesn't matter). In this case, the root filesystem is already linked into the kernel image itself, as an initramfs. So the iso9660 filesystem doesn't contain the root filesystem as is, but just the bootloader and the kernel image.

* BR2_TARGET_ROOTFS_ISO9660=y, BR2_TARGET_ROOTFS_ISO9660_INITRD=y and BR2_TARGET_ROOTFS_INITRAMFS disabled. In this case, a separate initrd is used. The iso9660 filesystem only contains the bootloader, the kernel and the initrd.

In order to support the first case out of the box, root=/dev/sr0 is added on the kernel command line in the example Grub configuration file, so that the kernel knows where the root filesystem is located. This argument is ignored when initrd/initramfs are used.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 fs/iso9660/Config.in  |  27 ++++++++++++-
 fs/iso9660/iso9660.mk | 103 +++++++++++++++++++++++++++++++++++++++-----------
 fs/iso9660/menu.lst   |   2 +-
 3 files changed, 106 insertions(+), 26 deletions(-)

fs/iso9660/Config.in +25 -2

index 111158b..e300fdb 100644
@@ -2,11 +2,23 @@ config BR2_TARGET_ROOTFS_ISO9660
        bool "iso image"
        depends on (BR2_i386 || BR2_x86_64)
        depends on BR2_LINUX_KERNEL
-       select BR2_TARGET_ROOTFS_CPIO
+       select BR2_LINUX_KERNEL_INSTALL_TARGET \
+              if (!BR2_TARGET_ROOTFS_ISO9660_INITRD && !BR2_TARGET_ROOTFS_INITRAMFS)
        select BR2_TARGET_GRUB
        select BR2_TARGET_GRUB_FS_ISO9660
        help
-         Build a bootable iso9660 image
+         Build a bootable ISO9660 image. By default, the root
+         filesystem is directly packed as the ISO9660 filesystem,
+         which means the root filesystem will be read-only. It
+         requires ISO9660 filesystem support and CDROM support in the
+         kernel.
+
+         However, if BR2_TARGET_ROOTFS_INITRAMFS or
+         BR2_TARGET_ROOTFS_ISO9660_INITRD have been enabled, the
+         ISO9660 filesystem will only contain a kernel image and
+         optionally an external initrd image. In this case, the
+         filesystem being in RAM, it will be read/write. No ISO9660
+         or CDROM support is needed in the kernel.
 
 if BR2_TARGET_ROOTFS_ISO9660
 

@@ -19,6 +31,17 @@ config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
          automatically be replaced by the path to the kernel and
          initrd images respectively.
 
+config BR2_TARGET_ROOTFS_ISO9660_INITRD
+       bool "Use initrd"
+       default y
+       select BR2_TARGET_ROOTFS_CPIO
+       help
+         Enable this option to have the root filesystem bundled as an
+         initrd/initramfs rather than directly as the ISO9660
+         filesystem. With this option enabled, the ISO9660 will only
+         contain a kernel image, an initrd image (unless an initramfs
+         linked into the kernel is used) and the bootloader.
+
 endif
 
 comment "iso image needs a Linux kernel to be built"

fs/iso9660/iso9660.mk +73 -13

index 2a8a447..a3572e2 100644
@@ -4,49 +4,104 @@
 #
 ################################################################################
 
-ROOTFS_ISO9660_TARGET_DIR = $(BUILD_DIR)/iso9660
+#
+# We need to handle three cases:
+#
+#  1. The ISO9660 filesystem will really be the real root filesystem
+#     itself. This is when BR2_TARGET_ROOTFS_ISO9660_INITRD is
+#     disabled.
+#
+#  2. The ISO9660 filesystem will be a filesystem with just a kernel
+#     image, initrd and grub. This is when
+#     BR2_TARGET_ROOTFS_ISO9660_INITRD is enabled, but
+#     BR2_TARGET_ROOTFS_INITRAMFS is disabled.
+#
+#  3. The ISO9660 filesystem will be a filesystem with just a kernel
+#     image and grub. This is like (2), except that the initrd is
+#     built into the kernel image. This is when
+#     BR2_TARGET_ROOTFS_INITRAMFS is enabled (regardless of the value
+#     of BR2_TARGET_ROOTFS_ISO9660_INITRD).
+
 ROOTFS_ISO9660_BOOT_MENU = $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
 
-ROOTFS_ISO9660_DEPENDENCIES = grub host-cdrkit host-fakeroot linux rootfs-cpio
+ROOTFS_ISO9660_DEPENDENCIES = grub host-cdrkit host-fakeroot linux
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_INITRD),y)
+ROOTFS_ISO9660_USE_INITRD = YES
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+ROOTFS_ISO9660_USE_INITRD = YES
+endif
+
+ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
+ROOTFS_ISO9660_TARGET_DIR = $(BUILD_DIR)/iso9660
+else
+ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR)
+endif
+
+define ROOTFS_ISO9660_PREPARATION
+       $(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
+               $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
+       $(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_BOOT_MENU) \
+               $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+       $(SED) "s%__KERNEL_PATH__%/boot/$(LINUX_IMAGE_NAME)%" \
+               $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+endef
+
+ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_PREPARATION
 
+# Splash screen disabling
 ifeq ($(BR2_TARGET_GRUB_SPLASH),)
-define ROOTFS_ISO9660_SPLASHSCREEN
+define ROOTFS_ISO9660_DISABLE_SPLASHSCREEN
        $(SED) '/^splashimage/d' $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 endef
-else
-define ROOTFS_ISO9660_SPLASHSCREEN
+ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_SPLASHSCREEN
+endif
+
+define ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD
+       $(SED) '/__INITRD_PATH__/d'  $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+endef
+
+ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
+
+# Copy splashscreen to temporary filesystem
+ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
+define ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
        $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \
                $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/splash.xpm.gz
 endef
+ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
 endif
 
-ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
-define ROOTFS_ISO9660_INITRD
-       $(SED) '/__INITRD_PATH__/d'  $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+# Copy the kernel to temporary filesystem
+define ROOTFS_ISO9660_COPY_KERNEL
+       $(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) \
+               $(ROOTFS_ISO9660_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
 endef
-else
-define ROOTFS_ISO9660_INITRD
+
+ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_COPY_KERNEL
+
+# Copy initrd to temporary filesystem if needed
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),)
+ROOTFS_ISO9660_DEPENDENCIES += rootfs-cpio
+define ROOTFS_ISO9660_COPY_INITRD
        $(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
                $(ROOTFS_ISO9660_TARGET_DIR)/boot/initrd
        $(SED) "s%__INITRD_PATH__%/boot/initrd%" \
                $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
 endef
+ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_COPY_INITRD
+else
+ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD
 endif
 
-define ROOTFS_ISO9660_PREPARATION
-       $(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
-               $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito

fs/iso9660/iso9660.mk +2 -1

-ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_PREPARATION
 
 define ROOTFS_ISO9660_CMD
        $(HOST_DIR)/usr/bin/genisoimage -J -R -b boot/grub/stage2_eltorito \

@@ -54,10 +109,12 @@ define ROOTFS_ISO9660_CMD
                -o $@ $(ROOTFS_ISO9660_TARGET_DIR)
 endef
 
+ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
 define ROOTFS_ISO9660_REMOVE_TEMPDIR
        $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
 endef
 
 ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_REMOVE_TEMPDIR
+endif
 
 $(eval $(call ROOTFS_TARGET,iso9660))

fs/iso9660/menu.lst +1 -2

index 8e8309f..eb1ecef 100644
@@ -12,7 +12,7 @@ foreground    000000
 background     cccccc
 
 title          Buildroot ISO9660 image
-kernel         __KERNEL_PATH__
+kernel         __KERNEL_PATH__ root=/dev/sr0
 initrd         __INITRD_PATH__
 
 title          Hard Drive (first partition)
--

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Until now, the iso9660 filesystem handling only supported using an initrd/initramfs to store the root filesystem, which is very different from what we do with the other filesystems.

This commit changes the iso9660 logic to also allow using directly an iso9660 filesystem to store the root filesystem. A new option, BR2_TARGET_ROOTFS_ISO9660_INITRD, is created to tell the iso9660 that we want to use an initrd and not directly the root filesystem in iso9660 format. This option defaults to 'y' to preserve the existing behavior.

Signed-off-by Thomas Petazzoni <[email protected]>

+ROOTFS_ISO9660_TARGET_DIR = $(BUILD_DIR)/iso9660

fs/iso9660/iso9660.mk +34 -9

@@ -40,32 +40,56 @@ else
 ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR)
 endif
 
-define ROOTFS_ISO9660_PREPARATION
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
+ROOTFS_ISO9660_DEPENDENCIES += grub
+ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
+       $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+ROOTFS_ISO9660_BOOT_IMAGE = boot/grub/stage2_eltorito
+define ROOTFS_ISO9660_INSTALL_BOOTLOADER
        $(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
                $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
+endef
+else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_ISOLINUX),y)
+ROOTFS_ISO9660_DEPENDENCIES += syslinux
+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 $(SYSLINUX_DIR)/bios/core/isolinux.bin \
+               $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/isolinux.bin
+       $(INSTALL) -D -m 0644 $(SYSLINUX_DIR)/bios/com32/elflink/ldlinux/ldlinux.c32 \
+               $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ldlinux.c32
+endef
+endif
+
+define ROOTFS_ISO9660_PREPARATION
        $(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_BOOT_MENU) \
-               $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+               $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
        $(SED) "s%__KERNEL_PATH__%/boot/$(LINUX_IMAGE_NAME)%" \
-               $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+               $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
+       $(ROOTFS_ISO9660_INSTALL_BOOTLOADER)
 endef
 
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_PREPARATION
 
-# Splash screen disabling
+# Grub splash screen disabling
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
 ifeq ($(BR2_TARGET_GRUB_SPLASH),)
 define ROOTFS_ISO9660_DISABLE_SPLASHSCREEN
-       $(SED) '/^splashimage/d' $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+       $(SED) '/^splashimage/d' $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
 endef
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_SPLASHSCREEN
 endif
+endif
 
 define ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD
-       $(SED) '/__INITRD_PATH__/d'  $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+       $(SED) '/__INITRD_PATH__/d'  $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
 endef
 
 ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
 
-# Copy splashscreen to temporary filesystem
+# Copy Grub splashscreen to temporary filesystem
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
 ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
 define ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
        $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \

@@ -73,6 +97,7 @@ define ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
 endef
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
 endif
+endif
 
 # Copy the kernel to temporary filesystem
 define ROOTFS_ISO9660_COPY_KERNEL

@@ -89,7 +114,7 @@ define ROOTFS_ISO9660_COPY_INITRD
        $(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
                $(ROOTFS_ISO9660_TARGET_DIR)/boot/initrd
        $(SED) "s%__INITRD_PATH__%/boot/initrd%" \
-               $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+               $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
 endef
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_COPY_INITRD
 else

@@ -104,7 +129,7 @@ endif # BR2_TARGET_ROOTFS_ISO9660_INITRD
 
 
 define ROOTFS_ISO9660_CMD
-       $(HOST_DIR)/usr/bin/genisoimage -J -R -b boot/grub/stage2_eltorito \
+       $(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)
 endef

fs/iso9660/isolinux.cfg new file +6 -1

new file mode 100644
index 0000000..2bdf48b
@@ -0,0 +1,6 @@
+default 1
+display sample.msg
+label 1
+      kernel __KERNEL_PATH__
+      append initrd=__INITRD_PATH__
+      append root=/dev/sr0
--

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Until now, the ISO9660 image generation logic was only supporting the Grub bootloader. This commit adds support to use isolinux (from syslinux) instead of grub, as an option.

From a Config.in point of view, we switch from having BR2_TARGET_ROOTFS_ISO9660 select BR2_TARGET_GRUB to using a 'depends on'. This is because for isolinux, we would need to select BR2_TARGET_SYSLINUX_ISOLINUX, but BR2_TARGET_SYSLINUX_ISOLINUX is part of a Kconfig 'choice', so we can't do a select. So instead, the BR2_TARGET_ROOTFS_ISO9660 now depends on either BR2_TARGET_GRUB or BR2_TARGET_SYSLINUX_ISOLINUX being available.

The .mk file is re-organized a bit to be a bit more generic:

- a variable called ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH is introduced to reflect the path to the bootloader configuration file (which is later modified to replace __KERNEL_PATH__ and __INITRD_PATH__ to the appropriate values)

- a variable called ROOTFS_ISO9660_BOOT_IMAGE is introduced to give the path to the bootloader-specific boot image, as needed by genisoimage -b option.

- a variable called ROOTFS_ISO9660_INSTALL_BOOTLOADER is introduced with the commands needed to do the bootloader-specific installation steps

This patch is based on previous patches submitted by Jerome Sagnole <[email protected]> and No? Rubinstein <[email protected]>.

Signed-off-by Thomas Petazzoni <[email protected]>

fs/iso9660/iso9660.mk +7 -1

index a3572e2..c95485c 100644
@@ -40,32 +40,56 @@ else
 ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR)
 endif
 
-define ROOTFS_ISO9660_PREPARATION
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
+ROOTFS_ISO9660_DEPENDENCIES += grub
+ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
+	$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+ROOTFS_ISO9660_BOOT_IMAGE = boot/grub/stage2_eltorito
+define ROOTFS_ISO9660_INSTALL_BOOTLOADER
 	$(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
 		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
+endef

fs/iso9660/iso9660.mk +17 -8

+endef
+endif
+
+define ROOTFS_ISO9660_PREPARATION
 	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_BOOT_MENU) \
-		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+		$(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
 	$(SED) "s%__KERNEL_PATH__%/boot/$(LINUX_IMAGE_NAME)%" \
-		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+		$(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
+	$(ROOTFS_ISO9660_INSTALL_BOOTLOADER)
 endef
 
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_PREPARATION
 
-# Splash screen disabling
+# Grub splash screen disabling
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
 ifeq ($(BR2_TARGET_GRUB_SPLASH),)
 define ROOTFS_ISO9660_DISABLE_SPLASHSCREEN
-	$(SED) '/^splashimage/d' $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	$(SED) '/^splashimage/d' $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
 endef
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_SPLASHSCREEN
 endif
+endif
 
 define ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD
-	$(SED) '/__INITRD_PATH__/d'  $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	$(SED) '/__INITRD_PATH__/d'  $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
 endef
 
 ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
 
-# Copy splashscreen to temporary filesystem
+# Copy Grub splashscreen to temporary filesystem
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
 ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
 define ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
 	$(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \

@@ -73,6 +97,7 @@ define ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
 endef
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
 endif
+endif
 
 # Copy the kernel to temporary filesystem
 define ROOTFS_ISO9660_COPY_KERNEL

@@ -89,7 +114,7 @@ define ROOTFS_ISO9660_COPY_INITRD
 	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
 		$(ROOTFS_ISO9660_TARGET_DIR)/boot/initrd
 	$(SED) "s%__INITRD_PATH__%/boot/initrd%" \
-		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
+		$(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
 endef
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_COPY_INITRD
 else

@@ -104,7 +129,7 @@ endif # BR2_TARGET_ROOTFS_ISO9660_INITRD
 
 
 define ROOTFS_ISO9660_CMD
-	$(HOST_DIR)/usr/bin/genisoimage -J -R -b boot/grub/stage2_eltorito \
+	$(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)
 endef

fs/iso9660/isolinux.cfg new file +0 -0

new file mode 100644
index 0000000..2bdf48b

fs/iso9660/isolinux.cfg new file +4 -0

+label 1
+      kernel __KERNEL_PATH__
+      append initrd=__INITRD_PATH__
+      append root=/dev/sr0

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

This patch is quite large, and could benefit from being splitted in three:

- first patch introduces the ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH and ROOTFS_ISO9660_BOOT_IMAGE variables

- second patch to introduce the bootloader choice, but with only a single entrey 'grub', and the .mk re-organisation (still with only grub handling),

- then a third patch adds isolinux support.

That'd make it easier to review...

Since I'm quite interested in the end-result of this series (multi-format bootable images), I can help if you don;t have time. Just ping me... ;-)

fs/iso9660/iso9660.mk else · line 61

Quoted 2 lines

fs/iso9660/iso9660.mk +2 -0

+	$(INSTALL) -D -m 0644 $(SYSLINUX_DIR)/bios/com32/elflink/ldlinux/ldlinux.c32 \
+		$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ldlinux.c32

syslinux/isolinux already installs isolinux.bin and the .c32 modules in $(BINARIES_DIR)/syslinux, so you should probably get them from there, rather than cherry-pick from the package dir (in case a later version bump moves them, like it did when I last updated the package).

Except ldlinux.c32 is not systematically installed; we should probably change that first (what use would we have of a syslinux/isolinux that can't load a Linux kernel? :-] ).

fs/iso9660/isolinux.cfg line 2

Quoted 8 lines

fs/iso9660/isolinux.cfg new file +2 -0

new file mode 100644
index 0000000..2bdf48b
@@ -0,0 +1,6 @@
+default 1
+display sample.msg

Where's that file comming from?

Also, there is the possibility for syslinux/isolinux to display graphics, too, but it is much more invvolved (but that'd be great!)

Quoted 3 lines

Since I'm quite interested in the end-result of this series (multi-format bootable images), I can help if you don;t have time. Just ping me... ;-)

Actually, your review is arriving at exactly the right time. I'm having a 10+ hours flight tomorrow, which will be a perfect opportunity to prepare a v2 of this series.

I did the v1 on the 10+ hours flight to go, so having something to do on the return trip is great.

Quoted 11 lines

fs/iso9660/isolinux.cfg line 2

Quoted 8 lines

fs/iso9660/isolinux.cfg new file +2 -0

new file mode 100644
index 0000000..2bdf48b
@@ -0,0 +1,6 @@
+default 1
+display sample.msg

Where's that file comming from?

Quoted 2 lines

Also, there is the possibility for syslinux/isolinux to display graphics, too, but it is much more invvolved (but that'd be great!)

The precise reason why there is this leftover "display sample.msg" is because I tried to get the splash image support of isolinux to work. I didn't succeed and gave up (no Internet access while flying, so I was limited to just the isolinux documentation and source code) but forgot to kill that line. I'll kill it off for now, until someone interested enough in having a splash image with isolinux works on that.

This commit adds a new option, which allows, when isolinux is used as the bootloader, to generate an "hybrid" ISO image. Such images can either be booted from CD-ROM or from USB keys. It simply uses the isohybrid tool provided by syslinux.

Signed-off-by Thomas Petazzoni <[email protected]>

This commit adds a new option, which allows, when isolinux is used as the bootloader, to generate an "hybrid" ISO image. Such images can either be booted from CD-ROM or from USB keys. It simply uses the isohybrid tool provided by syslinux.

Signed-off-by Thomas Petazzoni <[email protected]>

fs/iso9660/iso9660.mk +5 -0

+endef
+
+ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_GEN_HYBRID
+endif
+
 $(eval $(call ROOTFS_TARGET,iso9660))

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

In order to support ISO9660 bootable images that rely on Grub 2, this commit modifies thr Grub 2 makefile to generate and install an El

Torito image. Such an image is simply produced by concatenating the cdboot.img provided by Grub 2, and the Grub 2 image generated by Buildroot using grub-mkimage.

Since this action is so simple and cost-free, we don't bother adding a Grub 2 sub-option for that, and simply generate the El Torito image unconditionally.

Signed-off-by Thomas Petazzoni <[email protected]>

In order to support ISO9660 bootable images that rely on Grub 2, this commit modifies thr Grub 2 makefile to generate and install an El Torito image. Such an image is simply produced by concatenating the cdboot.img provided by Grub 2, and the Grub 2 image generated by Buildroot using grub-mkimage.

Since this action is so simple and cost-free, we don't bother adding a Grub 2 sub-option for that, and simply generate the El Torito image unconditionally.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 boot/grub2/grub2.mk | 2 ++
 1 file changed, 2 insertions(+)

boot/grub2/grub2.mk +0 -0

index 697f0ad..dd04bb3 100644

boot/grub2/grub2.mk +0 -0

 	mkdir -p $(dir $(GRUB2_CFG))
 	$(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG)
 endef

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

In order to support ISO9660 bootable images that rely on Grub 2, this commit modifies thr Grub 2 makefile to generate and install an El Torito image. Such an image is simply produced by concatenating the cdboot.img provided by Grub 2, and the Grub 2 image generated by Buildroot using grub-mkimage.

Since this action is so simple and cost-free, we don't bother adding a Grub 2 sub-option for that, and simply generate the El Torito image unconditionally.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 boot/grub2/grub2.mk | 2 ++
 1 file changed, 2 insertions(+)

boot/grub2/grub2.mk +0 -0

index 697f0ad..dd04bb3 100644

boot/grub2/grub2.mk +0 -0

 	mkdir -p $(dir $(GRUB2_CFG))
 	$(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG)
 endef

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 5 lines

boot/grub2/grub2.mk +0 -0

index 697f0ad..dd04bb3 100644
@@ -76,6 +76,8 @@ define GRUB2_IMAGE_INSTALLATION

boot/grub2/grub2.mk define GRUB2_IMAGE_INSTALLATION · line 80

Quoted 5 lines

boot/grub2/grub2.mk +2 -0

 		-p "$(GRUB2_PREFIX)" \
 		$(if $(GRUB2_BUILTIN_CONFIG),-c $(GRUB2_BUILTIN_CONFIG)) \
 		$(GRUB2_BUILTIN_MODULES)
+	cat $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE)/cdboot.img \
+		$(GRUB2_IMAGE) > $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE)/grub-eltorito.img

In retrospect, I think you should install that in $(BINARIES_DIR), like is done for $(GRUB2_IMAGE), not in $(HOST_DIR).

Quoted 14 lines

boot/grub2/grub2.mk define GRUB2_IMAGE_INSTALLATION · line 80

Quoted 11 lines

boot/grub2/grub2.mk +2 -0

index 697f0ad..dd04bb3 100644
@@ -76,6 +76,8 @@ define GRUB2_IMAGE_INSTALLATION
 		-p "$(GRUB2_PREFIX)" \
 		$(if $(GRUB2_BUILTIN_CONFIG),-c $(GRUB2_BUILTIN_CONFIG)) \
 		$(GRUB2_BUILTIN_MODULES)
+	cat $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE)/cdboot.img \
+		$(GRUB2_IMAGE) > $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE)/grub-eltorito.img

In retrospect, I think you should install that in $(BINARIES_DIR), like is done for $(GRUB2_IMAGE), not in $(HOST_DIR).

Well, I had a reason to install it in HOST_DIR rather than BINARIES_DIR. Since I'm producing this image unconditionally, even if the user is not interested in ISO9660, I didn't want to clutter BINARIES_DIR with this file, which would appear as soon as the user enables grub2. So I preferred to install it together with all the other "internal" Grub images in HOST_DIR, and pick it up from there in the iso9660.mk logic.

Now, if you think cluttering BINARIES_DIR with this file only useful for ISO booting as soon as Grub 2 is enabled is fine, then I'll happily change it.

Thanks for the review!

After having extended the iso9660 support to allow isolinux as an alternative to grub, this commit adds grub2 as a third alternative. With the previous work done to support isolinux, adding support for grub2 is fairly trivial.

Signed-off-by Thomas Petazzoni <[email protected]>

After having extended the iso9660 support to allow isolinux as an alternative to grub, this commit adds grub2 as a third alternative. With the previous work done to support isolinux, adding support for grub2 is fairly trivial.

Signed-off-by Thomas Petazzoni <[email protected]>

fs/iso9660/Config.in config BR2_TARGET_ROOTFS_ISO9660_HYBRID · line 84

Quoted 2 lines

fs/iso9660/Config.in +1 -1

-comment "iso image needs a Linux kernel and grub or isolinux to be built"
+comment "iso image needs a Linux kernel and grub(2) or isolinux to be built"

I ghave to admit that reading this comment using the usual associativity of 'and' and 'or' makes it sound that we either want
- a kernel and grub/grub2,
- or isolinux

fs/iso9660/grub.cfg line 5

Quoted 2 lines

fs/iso9660/grub.cfg new file +2 -0

+menuentry "Buildroot" {
+	linux __KERNEL_PATH__ root=/dev/sr0 console=tty1

Why do you forcibly pass the console setting?

Dear Yann E. MORIN,

Quoted 7 lines · Yann E. MORIN

fs/iso9660/Config.in config BR2_TARGET_ROOTFS_ISO9660_HYBRID · line 84

Quoted 2 lines

fs/iso9660/Config.in +1 -1

-comment "iso image needs a Linux kernel and grub or isolinux to be built"
+comment "iso image needs a Linux kernel and grub(2) or isolinux to be built"

I ghave to admit that reading this comment using the usual associativity of 'and' and 'or' makes it sound that we either want
- a kernel and grub/grub2,
- or isolinux

True. Any suggestion to improve that?

comment "iso image needs (a Linux kernel && (grub(2) || isolinux))"

is probably a bit hard to read, no ? :-)

Quoted 4 lines

fs/iso9660/grub.cfg line 5

Quoted 2 lines

fs/iso9660/grub.cfg new file +2 -0

+menuentry "Buildroot" {
+	linux __KERNEL_PATH__ root=/dev/sr0 console=tty1

Why do you forcibly pass the console setting?

That's a good question. We don't have that for the grub and isolinux case, so I'm not sure why I added that for the grub2 case. I'll kill that and retest. Thanks for noticing!