new package - generate iso with isolinux bootloader

Signed-off-by jean <[email protected]>

---
  fs/Config.in            |    1 +
  fs/isolinux/Config.in   |  182 ++++++++++++++++++++++++++++++++++++++
  fs/isolinux/isolinux.mk |  226 +++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 409 insertions(+)

create mode 100644 fs/isolinux/Config.in
create mode 100644 fs/isolinux/isolinux.mk

fs/Config.in +1 -0

index da4c5ff..02294a9 100644
@@ -11,5 +11,6 @@ source "fs/romfs/Config.in"
  source "fs/squashfs/Config.in"
  source "fs/tar/Config.in"
  source "fs/ubifs/Config.in"
+source "fs/isolinux/Config.in"
 
  endmenu

fs/isolinux/Config.in new file +182 -0

new file mode 100644
index 0000000..8abe409
@@ -0,0 +1,182 @@
+## Menu ISO image with syslinux
+menu "iso image (isolinux bootloader - with initramfs)"
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX
+	bool "iso image (isolinux bootloader)"
+	depends on (BR2_i386 || BR2_x86_64)
+	depends on BR2_LINUX_KERNEL
+	select BR2_TARGET_ROOTFS_INITRAMFS
+	select BR2_TARGET_SYSLINUX
+	select BR2_TARGET_SYSLINUX_ISOLINUX
+	help
+		Build a bootable iso9660 image (with isolinux bootloader and initramfs)
+		You can launch this iso with :
+			qemu -boot d -cdrom rootfs.isolinux
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_JOLIET
+        bool "create iso with Joliet format"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+              	Create iso image with Joliet format (long file)
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_ROCK_RIDGE
+        bool "Generate Rock Ridge directory information"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+                Generate Rock Ridge directory information
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_MENU_LINUX
+        string "Name to start linux"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        default "buildroot"
+        help
+                define message see to select linux
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_NAME
+        string "Name iso"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        default "buildroot iso"
+        help
+                cdrom name
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_INPUT_CHARSET
+        string "define parameter input charset"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+	default "iso8859-15"
+        help
+                define parameter input charset
+		(see program genisoimage : genisoimage -input-charset help)
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_BOOT_MESSAGE
+	string "Message boot for isolinux"
+	depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+	default "Buildroot isolinux boot"
+	help
+		define first message see in prompt boot
+		after that, you see all options
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_BOOT_TIMEOUT
+	int "timeout"
+	depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        default "20"
+	help
+		define timeout (second)
+		after this time, boot on default config
+
+config BR2_TARGET_ISO_ISOLINUX_TOOLS_HARDWARE_INFO
+	bool "add tools hardware info"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+		isolinux menu, you can see hardware info
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_TOOLS_REBOOT
+        bool "add isolinux option reboot"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+                isolinux menu, you can reboot
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_TOOLS_POWEROFF
+        bool "add isolinux option poweroff"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+                isolinux menu, you can power off
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_TOOLS_FIRSTDISKBOOT
+        bool "add isolinux option to boot on first disk"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+                isolinux menu, you can boot on disk
+
+## Keyboard menu
+menu "keyboard"
+depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+depends on BR2_PACKAGE_KBD
+
+## Choice default keyboard on boot (isolinux only)
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD
+        string
+choice
+	prompt "Default keyboard on isolinux boot"
+	default BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_US if BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD = "us"
+	default BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_FR if BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD = "fr"
+	default BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_FR_PC if BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD = "fr-pc"
+	default BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_DE if BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD = "de"
+	default BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_MANUAL if BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD = "manual"
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_US
+	bool "us"
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_FR
+	bool "fr"
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_FR_PC
+	bool "fr-pc"
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_DE
+	bool "de"
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_MANUAL
+	bool "manual"
+	depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_ACTIVATE
+
+endchoice
+## End choice default keyboard on boot (isolinux only)
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_US
+	bool "keyboard us"
+	depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+		activate option keyboard us (exist by default)
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_FR
+	bool "keyboard fr"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+                activate option keyboard fr
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_FR_PC
+	bool "keyboard fr-pc"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+                activate option keyboard fr_pc
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_DE
+	bool "keyboard de"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        help
+                activate option keyboard de
+
+
+menu "Manual configuration keyboard"
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_ACTIVATE
+	bool "Enable manual configuration"
+	depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+	help
+		Activate manual keyboard configuration
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_NAME
+        string "Name of keyboard"
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+        depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_ACTIVATE
+        default "unknown"
+        help
+                define name to select this keyboard in isolinux menu
+
+config BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_SOURCE
+	string "File source to generate the keyboard map"
+	depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX
+	depends on BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_ACTIVATE
+        default "data/keymaps/i386/qwerty/us.map"
+        help
+                define map file to generate the keyboard configuration
+		root is kbd package
+		example : data/keymaps/i386/qwerty/gr.map
+
+endmenu
+## End manual configuration keyboard
+
+endmenu
+## End keyboard menu
+
+endmenu
+## End Menu ISO image with syslinux

fs/isolinux/isolinux.mk new file +226 -0

new file mode 100644
index 0000000..0d9464d
@@ -0,0 +1,226 @@
+################################################################################
+#
+# Build the iso96600 with isolinux bootloader (and initramfs)
+#
+################################################################################
+
+BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_BOOT=boot
+BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_ISOLINUX=isolinux
+BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS=tools
+BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD=keyboard
+
+BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR = $(BUILD_DIR)/isolinux
+BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_BOOT = $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)/$(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_BOOT)
+BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_ISOLINUX = $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)/$(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_ISOLINUX)
+BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_TOOLS = $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)/$(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS)
+BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_KEYBOARD = $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)/$(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)
+
+BR2_TARGET_ISO_ISOLINUX_BOOT_MESSAGE := $(call qstrip,$(BR2_TARGET_ROOTFS_ISO_ISOLINUX_BOOT_MESSAGE))
+BR2_TARGET_ISO_ISOLINUX_BOOT_TIMEOUT := $(call qstrip,$(BR2_TARGET_ROOTFS_ISO_ISOLINUX_BOOT_TIMEOUT))
+
+BR2_TARGET_ISO_ISOLINUX_KEYBOARD_US = $(KBD_BUILDDIR)data/keymaps/i386/qwerty/us.map
+
+BR2_TARGET_ISO_ISOLINUX_CONFIG = ""
+BR2_TARGET_ISO_BR2_TARGET_ISO_ISOLINUX_BOOT_MSG = ""
+
+define copy_files_isolinux_image_tools
+	cp $(1) $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_TOOLS);
+endef
+
+define copy_files_isolinux_image_keyboard
+	$(SYSLINUX_BUILDDIR)utils/keytab-lilo \
+	        $(BR2_TARGET_ISO_ISOLINUX_KEYBOARD_US) \
+        	$1 \
+	         > $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_KEYBOARD)/$(subst -,_,$(notdir $(basename $1))).ktl;
+endef
+
+$(BINARIES_DIR)/rootfs.isolinux: host-cdrkit linux syslinux rootfs-initramfs
+	@$(call MESSAGE,"Generating root filesystem image rootfs.isolinux")
+	@mkdir -p $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)
+	@mkdir -p $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_BOOT)
+	@mkdir -p $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_ISOLINUX)
+	@mkdir -p $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_TOOLS)
+	@mkdir -p $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR_KEYBOARD)
+
+	@echo -e $(BR2_TARGET_ISO_BR2_TARGET_ISO_ISOLINUX_BOOT_MSG) > $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)/bootmsg.txt
+
+	@cp $(BINARIES_DIR)/isolinux.bin $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)/$(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_ISOLINUX)/
+	@cp $(LINUX_IMAGE_PATH) $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)/$(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_BOOT)/
+
+	@echo -e $(BR2_TARGET_ISO_ISOLINUX_CONFIG) > $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)/isolinux.cfg
+	
+	@$(foreach file, $(BR2_TARGET_ISO_ISOLINUX_LIST_TOOLS), $(call copy_files_isolinux_image_tools, $(file) ) )
+	@$(foreach file, $(BR2_TARGET_ISO_ISOLINUX_LIST_KEYBOARD), $(call copy_files_isolinux_image_keyboard, $(file) ) )
+
+	$(HOST_DIR)/usr/bin/genisoimage \
+		$(BR2_TARGET_ISO_ISOLINUX_GENISOIMAGE_OPTION) \
+		-o $(BINARIES_DIR)/rootfs.isolinux \
+		-b $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_ISOLINUX)/isolinux.bin \
+		-no-emul-boot \
+		-c $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_ISOLINUX)/boot.cat \
+		-boot-load-size 4 \
+		-boot-info-table \
+		-input-charset $(BR2_TARGET_ROOTFS_ISO_ISOLINUX_INPUT_CHARSET) \
+		-V $(BR2_TARGET_ROOTFS_ISO_ISOLINUX_NAME) \
+		$(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)
+
+	- at rm -rf $(BR2_TARGET_ISO_ISOLINUX_BUILDIMAGE_DIR)
+
+rootfs-isolinux: $(BINARIES_DIR)/rootfs.isolinux
+
+################################################################################
+#
+# Toplevel Makefile options
+#
+################################################################################
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX),y)
+TARGETS+=rootfs-isolinux
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "display bootmsg.txt\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "default $(BR2_TARGET_ROOTFS_ISO_ISOLINUX_MENU_LINUX)\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "timeout $(BR2_TARGET_ISO_ISOLINUX_BOOT_TIMEOUT)\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "prompt 1\\n"
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_JOLIET),y)
+BR2_TARGET_ISO_ISOLINUX_GENISOIMAGE_OPTION += -J
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_ROCK_RIDGE),y)
+BR2_TARGET_ISO_ISOLINUX_GENISOIMAGE_OPTION += -R
+endif
+
+# By default it us keyboard
+#ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_US),y)
+#BR2_TARGET_ISO_ISOLINUX_CONFIG += "kbdmap $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)/us.ktl"
+#BR2_TARGET_ISO_ISOLINUX_KEYBOARD_US_ACTIVATED=y
+#endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_FR),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "kbdmap $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)/fr.ktl\\n"
+BR2_TARGET_ISO_ISOLINUX_KEYBOARD_FR_ACTIVATED=y
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_FR_PC),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "kbdmap $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)/fr_pc.ktl\\n"
+BR2_TARGET_ISO_ISOLINUX_KEYBOARD_FR_PC_ACTIVATED=y
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_DESIRED_KEYBOARD_DE),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "kbdmap $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)/de.ktl\\n"
+BR2_TARGET_ISO_ISOLINUX_KEYBOARD_DE_ACTIVATED=y
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL $(BR2_TARGET_ROOTFS_ISO_ISOLINUX_MENU_LINUX)\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  KERNEL $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_BOOT)/bzImage\\n"
+BR2_TARGET_ISO_BR2_TARGET_ISO_ISOLINUX_BOOT_MSG += "$(BR2_TARGET_ISO_ISOLINUX_BOOT_MESSAGE)\n"
+BR2_TARGET_ISO_BR2_TARGET_ISO_ISOLINUX_BOOT_MSG += "  $(BR2_TARGET_ROOTFS_ISO_ISOLINUX_MENU_LINUX)) launch linux\n"
+endif
+
+ifeq ($(BR2_TARGET_ISO_ISOLINUX_TOOLS_HARDWARE_INFO),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL hdt\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  MENU LABEL Hardware Info\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  COM32 $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS)/hdt.c32\\n"
+BR2_TARGET_ISO_BR2_TARGET_ISO_ISOLINUX_BOOT_MSG += "  hdt) hardware info\n"
+BR2_TARGET_ISO_ISOLINUX_LIST_TOOLS += $(SYSLINUX_BUILDDIR)com32/hdt/hdt.c32
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_TOOLS_REBOOT),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL reboot\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  MENU LABEL Reboot\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  KERNEL $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS)/reboot.c32\\n"
+BR2_TARGET_ISO_BR2_TARGET_ISO_ISOLINUX_BOOT_MSG += "  reboot) reboot server\n"
+BR2_TARGET_ISO_ISOLINUX_LIST_TOOLS += $(SYSLINUX_BUILDDIR)com32/modules/reboot.c32
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_TOOLS_POWEROFF),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL poweroff\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  MENU LABEL Poweroff\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  KERNEL $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS)/poweroff.com\\n"
+BR2_TARGET_ISO_BR2_TARGET_ISO_ISOLINUX_BOOT_MSG += "  poweroff) poweroff server\n"
+BR2_TARGET_ISO_ISOLINUX_LIST_TOOLS += $(SYSLINUX_BUILDDIR)modules/poweroff.com
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_TOOLS_FIRSTDISKBOOT),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL hd\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  MENU LABEL Boot from first hard disk\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  localboot 0x80\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  append -\\n"
+BR2_TARGET_ISO_BR2_TARGET_ISO_ISOLINUX_BOOT_MSG += "  hd) boot on first hard disk\n"
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_US),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL us\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  MENU LABEL keyboard US (qwerty)\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  KERNEL $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS)/kbdmap.c32\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  APPEND $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)/us.ktl\\n"
+BR2_TARGET_ISO_BR2_TARGET_KEYBOARD_OPTION += us
+BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_ACTIVATED=y
+BR2_TARGET_ISO_ISOLINUX_KEYBOARD_US_ACTIVATED=y
+endif
+
+ifeq ($(BR2_TARGET_ISO_ISOLINUX_KEYBOARD_US_ACTIVATED),y)
+BR2_TARGET_ISO_ISOLINUX_LIST_KEYBOARD +=  $(KBD_BUILDDIR)data/keymaps/i386/qwerty/us.map
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_FR),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL fr\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  MENU LABEL keyboard FR (azerty)\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  KERNEL $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS)/kbdmap.c32\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  APPEND $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)/fr.ktl\\n"
+BR2_TARGET_ISO_BR2_TARGET_KEYBOARD_OPTION += fr
+BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_ACTIVATED=y
+BR2_TARGET_ISO_ISOLINUX_KEYBOARD_FR_ACTIVATED=y
+endif
+
+ifeq ($(BR2_TARGET_ISO_ISOLINUX_KEYBOARD_FR_ACTIVATED),y)
+BR2_TARGET_ISO_ISOLINUX_LIST_KEYBOARD +=  $(KBD_BUILDDIR)data/keymaps/i386/azerty/fr.map
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_FR_PC),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL frpc\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  MENU LABEL keyboard FR-PC (azerty)\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  KERNEL $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS)/kbdmap.c32\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  APPEND $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)/fr_pc.ktl\\n"
+BR2_TARGET_ISO_BR2_TARGET_KEYBOARD_OPTION += frpc
+BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_ACTIVATED=y
+BR2_TARGET_ISO_ISOLINUX_KEYBOARD_FR_PC_ACTIVATED=y
+endif
+
+ifeq ($(BR2_TARGET_ISO_ISOLINUX_KEYBOARD_FR_PC_ACTIVATED),y)
+BR2_TARGET_ISO_ISOLINUX_LIST_KEYBOARD +=  $(KBD_BUILDDIR)data/keymaps/i386/azerty/fr-pc.map
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_DE),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL de\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  MENU LABEL keyboard DE (qwertz)\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  KERNEL $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS)/kbdmap.c32\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  APPEND $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)/de.ktl\\n"
+BR2_TARGET_ISO_BR2_TARGET_KEYBOARD_OPTION += de
+BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_ACTIVATED=y
+BR2_TARGET_ISO_ISOLINUX_KEYBOARD_DE_ACTIVATED=y
+endif
+
+ifeq ($(BR2_TARGET_ISO_ISOLINUX_KEYBOARD_DE_ACTIVATED),y)
+BR2_TARGET_ISO_ISOLINUX_LIST_KEYBOARD +=  $(KBD_BUILDDIR)data/keymaps/i386/qwertz/de.map
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_ACTIVATE),y)
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "LABEL $(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_NAME)\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  MENU LABEL keyboard $(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_NAME)\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  KERNEL $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_TOOLS)/kbdmap.c32\\n"
+BR2_TARGET_ISO_ISOLINUX_CONFIG += "  APPEND $(BR2_TARGET_ISO_ISOLINUX_ROOT_DIR_KEYBOARD)/$(subst -,_,$(notdir $(basename $(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_SOURCE)))).ktl\\n"
+BR2_TARGET_ISO_ISOLINUX_LIST_KEYBOARD +=  $(KBD_BUILDDIR)$(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_SOURCE)
+BR2_TARGET_ISO_BR2_TARGET_KEYBOARD_OPTION += $(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_MANUAL_NAME)
+BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_ACTIVATED=y
+endif
+
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO_ISOLINUX_KEYBOARD_ACTIVATED),y)
+BR2_TARGET_ISO_ISOLINUX_LIST_TOOLS += $(SYSLINUX_BUILDDIR)com32/modules/kbdmap.c32
+endif
+
+ifneq ($(BR2_TARGET_ISO_BR2_TARGET_KEYBOARD_OPTION),)
+BR2_TARGET_ISO_BR2_TARGET_ISO_ISOLINUX_BOOT_MSG += "  $(BR2_TARGET_ISO_BR2_TARGET_KEYBOARD_OPTION)) keyboard option"
+endif

Signed-off-by jean <[email protected]>

---
  fs/Config.in            |    1 +
  fs/isolinux/Config.in   |  182 ++++++++++++++++++++++++++++++++++++++
  fs/isolinux/isolinux.mk |  226 +++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 409 insertions(+)

create mode 100644 fs/isolinux/Config.in
create mode 100644 fs/isolinux/isolinux.mk

fs/Config.in +1 -0

index da4c5ff..02294a9 100644
@@ -11,5 +11,6 @@ source "fs/romfs/Config.in"
  source "fs/squashfs/Config.in"
  source "fs/tar/Config.in"
  source "fs/ubifs/Config.in"
+source "fs/isolinux/Config.in"
 
  endmenu

fs/isolinux/Config.in new file +0 -0

new file mode 100644
index 0000000..8abe409

First a generic comment. Is there any reason not to simply replace the
iso9660 filesystem? That one is currently using grub as a bootloader, but it doesn't work very well. So I think this patch is very valuable to get the iso9660 filesystem working properly again. But as it is now, it is too complex to be included in buildroot. See my comments below.

A second generic comment is about the choice of booting with an
initramfs. Why not boot with a (rockridge) iso9660 rootfs? Clearly it puts a bit more strain on the kernel config since iso9660 as well as the bus drivers (sata, usb) have to be linked in, but I think that would be a much nicer solution. This type of image containing the actual rootfs in a different format should really be generated by a post-image script instead of a filesystem target. Can the rest of the list give their opinion?

Dear Arnout Vandecappelle,

Quoted 5 lines · Arnout Vandecappelle

First a generic comment. Is there any reason not to simply replace the
iso9660 filesystem? That one is currently using grub as a bootloader, but it doesn't work very well. So I think this patch is very valuable to get the iso9660 filesystem working properly again. But as it is now, it is too complex to be included in buildroot. See my comments below.

What doesn't work with the current iso9660 filesystem support that is grub based? I've tested it recently, and it was working. I've even pushed a few improvements to it.

Quoted 7 lines

A second generic comment is about the choice of booting with an
initramfs. Why not boot with a (rockridge) iso9660 rootfs? Clearly it puts a bit more strain on the kernel config since iso9660 as well as the bus drivers (sata, usb) have to be linked in, but I think that would be a much nicer solution. This type of image containing the actual rootfs in a different format should really be generated by a post-image script instead of a filesystem target. Can the rest of the list give their opinion?

I don't think that ISO9660 supports symbolic links, ownership, permissions, device files and all these Unix filesystem features that are typically needed to use a given filesystem type as a Linux root filesystem.

To be honest it has been a couple of years since I tried it, and I
don't remember exactly. Here are a few issues that I can think of now.

* It doesn't actually build a rootfs, but rather a bootable image.

* grub has issues cross-compiling between x86_64 and i386 - but your recent patches may have fixed that.

* Bug#6092 (closed now, but not at the time I posted it).

* The issue that grub was built without iso support (fixed now, but not at the time I posted it).

Possibly iso9660 is working reliably by now.

Quoted 8 lines

Quoted 7 lines

A second generic comment is about the choice of booting with an
initramfs. Why not boot with a (rockridge) iso9660 rootfs? Clearly it puts a bit more strain on the kernel config since iso9660 as well as the bus drivers (sata, usb) have to be linked in, but I think that would be a much nicer solution. This type of image containing the actual rootfs in a different format should really be generated by a post-image script instead of a filesystem target. Can the rest of the list give their opinion?

Quoted 4 lines

I don't think that ISO9660 supports symbolic links, ownership, permissions, device files and all these Unix filesystem features that are typically needed to use a given filesystem type as a Linux root filesystem.

That's what RockRidge is for.

Quoted 8 lines

Quoted 8 lines

Quoted 7 lines

A second generic comment is about the choice of booting with an
initramfs. Why not boot with a (rockridge) iso9660 rootfs? Clearly it puts a bit more strain on the kernel config since iso9660 as well as the bus drivers (sata, usb) have to be linked in, but I think that would be a much nicer solution. This type of image containing the actual rootfs in a different format should really be generated by a post-image script instead of a filesystem target. Can the rest of the list give their opinion?

Quoted 6 lines

Quoted 4 lines

I don't think that ISO9660 supports symbolic links, ownership, permissions, device files and all these Unix filesystem features that are typically needed to use a given filesystem type as a Linux root filesystem.

That's what RockRidge is for.

Aaah, interesting, I didn't know that. So it would probably make a lot of sense to improve the ISO9660 support to:

* Generate just an ISO9660 root filesystem image by default

* Optionally, make it bootable using either Grub or isolinux

* Optionally, replace the ISO9660 root filesystem by an initramfs

Quoted 5 lines

Aaah, interesting, I didn't know that. So it would probably make a lot of sense to improve the ISO9660 support to:

* Generate just an ISO9660 root filesystem image by default

Quoted 3 lines

* Optionally, make it bootable using either Grub or isolinux

* Optionally, replace the ISO9660 root filesystem by an initramfs

The third one fits better in the genimages approach IMHO. The second
one as well - except that that is not possible, once the iso image is created you can't make it bootable anymore. So yes, I think that would really improve the iso9660 support.

However, I would also be happy with a patch that simply adds an option
to use isolinux instead of grub for the current iso9660 infrastructure.

Arnout, Jean,

Quoted 5 lines · Arnout Vandecappelle

Quoted 5 lines

Aaah, interesting, I didn't know that. So it would probably make a lot of sense to improve the ISO9660 support to:

* Generate just an ISO9660 root filesystem image by default

Quoted 7 lines

Quoted 3 lines

* Optionally, make it bootable using either Grub or isolinux

* Optionally, replace the ISO9660 root filesystem by an initramfs

The third one fits better in the genimages approach IMHO. The second
one as well - except that that is not possible, once the iso image is created you can't make it bootable anymore. So yes, I think that would really improve the iso9660 support.

I agree.

Quoted 2 lines

However, I would also be happy with a patch that simply adds an option
to use isolinux instead of grub for the current iso9660 infrastructure.

Yes, this would be interesting regardless of the other possible improvements discussed above.

Bottomline: Jean, if you could add the possibility of using isolinux as part of the existing fs/iso9660 stuff, that would be great.

Thanks a lot!

Thomas

From: jean <[email protected]>

Signed-off-by jean <[email protected]>

---
After Arnout's remark, (sorry, I read last month), I updated this module. Goal : use other method to generate iso (and I think it's work fine)
File : fs/isolinux/Config.in
1/ I suppress redundant comment
2/ Suppress menu and use conditional (replace 'depends on' by 'if/endif') 3/ Modify comment
4/ suppress option (keyboard, ...)
5/ replace 8 x space by tabulation
File : fs/isolinux/isolinux.mk
5/ suppress extension 'BR2_'
7/ use variable 'ISOLINUX_DIR'
8/ suppress keyboard option
9/ I can't use command '$(INSTALL) -D' beacause I don't define filenames (I keep old code) 10/ Hide command genisoimage (with option $@)

 fs/Config.in             |    2 +-
 fs/isolinux/Config.in    |  210 ++++++++++----------------------------------
 fs/isolinux/bootmsg.txt  |    4 +
 fs/isolinux/isolinux.cfg |    7 ++
 fs/isolinux/isolinux.mk  |  219 ++++++----------------------------------------
 5 files changed, 87 insertions(+), 355 deletions(-)
 create mode 100644 fs/isolinux/bootmsg.txt
 create mode 100644 fs/isolinux/isolinux.cfg

Dear jean.sorgemoel at laposte.net,

Quoted 4 lines · jean.sorgemoel at laposte.net

From: jean <[email protected]>

Signed-off-by jean <[email protected]>

Please add a commit log with details, explaining what the patch is doing.

Quoted 16 lines

---
After Arnout's remark, (sorry, I read last month), I updated this module. Goal : use other method to generate iso (and I think it's work fine)
File : fs/isolinux/Config.in
1/ I suppress redundant comment
2/ Suppress menu and use conditional (replace 'depends on' by 'if/endif') 3/ Modify comment
4/ suppress option (keyboard, ...)
5/ replace 8 x space by tabulation
File : fs/isolinux/isolinux.mk
5/ suppress extension 'BR2_'
7/ use variable 'ISOLINUX_DIR'
8/ suppress keyboard option
9/ I can't use command '$(INSTALL) -D' beacause I don't define filenames (I keep old code) 10/ Hide command genisoimage (with option $@)

Quoted 8 lines

  fs/Config.in             |    2 +-
  fs/isolinux/Config.in    |  210 ++++++++++----------------------------------
  fs/isolinux/bootmsg.txt  |    4 +
  fs/isolinux/isolinux.cfg |    7 ++
  fs/isolinux/isolinux.mk  |  219 ++++++----------------------------------------
  5 files changed, 87 insertions(+), 355 deletions(-)

create mode 100644 fs/isolinux/bootmsg.txt
create mode 100644 fs/isolinux/isolinux.cfg

You did your patch incorrectly: what you're sending here are the differences between your v1 and your v2. What we need is a single patch that contains all of your changes.

You need to squash your v2 changes into the original patch, to make only one patch that adds the isolinux stuff.

fs/iso9660/Config.in +16 -0

+
+endif # BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
+
+config BR2_TARGET_ROOTFS_ISO9660_JOLIET
+	bool "Create iso with Joliet format"
+	help
+	  Create iso image with Joliet format (long filenames)
+
+config BR2_TARGET_ROOTFS_ISO9660_ROCK_RIDGE
+	bool "Generate Rock Ridge directory information"
+	help
+	  Generate Rock Ridge directory information,
+	  which includes file mode, uid, gid, etc...
+
+config BR2_TARGET_ROOTFS_ISO9660_NAME
+	string "Volume label"

fs/iso9660/Config.in +1 -0

+
 comment "iso image needs a Linux kernel to be built"
 	depends on BR2_i386 || BR2_x86_64
 	depends on !BR2_LINUX_KERNEL

fs/iso9660/bootmsg.txt new file +4 -0

new file mode 100644
index 0000000..e67951b
@@ -0,0 +1,4 @@
+Buildroot isolinux boot
+  buildroot) launch linux
+  harddrive) Hard Drive (first partition)
+

fs/iso9660/iso9660.mk +0 -0

index a6a9c95..c39d244 100644

fs/iso9660/iso9660.mk +40 -2

+
+# Build ISO9660 with bootloader Grub
 $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub
 	@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
 	mkdir -p $(ISO9660_TARGET_DIR)

@@ -31,8 +39,15 @@ endif
 	rm -f $(FAKEROOT_SCRIPT)
 	echo "chown -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)" \
+	echo "$(HOST_DIR)/usr/bin/genisoimage " \
+		"$(GENISOIMAGE_OPTION) " \
+		"-b boot/grub/stage2_eltorito " \
+		"-no-emul-boot " \
+		"-boot-load-size 4 " \
+		"-boot-info-table " \
+		"-input-charset $(BR2_TARGET_ROOTFS_ISO9660_INPUT_CHARSET) " \
+		"-V $(BR2_TARGET_ROOTFS_ISO9660_NAME) " \
+		"-o $@ $(ISO9660_TARGET_DIR)" \
 		>> $(FAKEROOT_SCRIPT)
 	chmod a+x $(FAKEROOT_SCRIPT)
 	$(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT)

@@ -41,11 +56,65 @@ endif
 
 rootfs-iso9660: $(BINARIES_DIR)/rootfs.iso9660
 
+# Build ISO9660 with bootloader ISOLINUX
+$(BINARIES_DIR)/rootfs.isolinux.iso9660: host-cdrkit host-fakeroot linux syslinux rootfs-cpio
+	@$(call MESSAGE,"Generating root filesystem image rootfs.isolinux.iso9660")
+	@mkdir -p $(ISO9660_TARGET_DIR)
+	@mkdir -p $(ISO9660_TARGET_DIR_EXTRA)
+
+	@cp $(BR2_TARGET_ROOTFS_ISO9660_ISOLINUX_BOOT_MESSAGE) $(ISO9660_TARGET_DIR)
+
+	@cp $(BINARIES_DIR)/isolinux.bin $(ISO9660_TARGET_DIR)
+	@cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)
+	@cp $(BR2_TARGET_ROOTFS_ISO9660_ISOLINUX_CONFIG_FILE) $(ISO9660_TARGET_DIR)/isolinux.cfg
+
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+	@$(SED) '/INITRD/d'  $(ISO9660_TARGET_DIR)/isolinux.cfg
+else
+	@cp $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) $(ISO9660_TARGET_DIR)/initrd
+endif
+
+	@$(foreach file, $(ISO9660_LIST_EXTRA), $(call copy_files_isolinux_image_extra, $(file) ) )
+
+	# Use fakeroot to pretend all target binaries are owned by root
+	rm -f $(FAKEROOT_SCRIPT)
+	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
+	# Use fakeroot so mkisofs believes the previous fakery
+	echo "$(HOST_DIR)/usr/bin/genisoimage " \
+		"$(GENISOIMAGE_OPTION) " \
+		"-b isolinux.bin " \
+		"-no-emul-boot " \
+		"-c boot.cat " \

fs/iso9660/iso9660.mk +3 -0

+
+rootfs-isolinux-iso9660: $(BINARIES_DIR)/rootfs.isolinux.iso9660
+
 ################################################################################
 #
 # Toplevel Makefile options

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

new file mode 100644
index 0000000..f4887e4

From: jean <[email protected]>

default generate iso with grub bootloader
you can select isolinux bootloader

detail : (module fs/iso9660)
option to select bootloader (grub/isolinux)
can use initramfs (if activate), also cpio (like initrd)

Signed-off-by jean <[email protected]>

---
 fs/iso9660/Config.in    |   47 ++++++++++++++++++++++++++++++++++++++++++++---
 fs/iso9660/bootmsg.txt  |    4 ++++
 fs/iso9660/iso9660.mk   |   26 ++++++++++++++++++++++++--
 fs/iso9660/isolinux.cfg |   10 ++++++++++
 4 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 fs/iso9660/bootmsg.txt
 create mode 100644 fs/iso9660/isolinux.cfg

fs/iso9660/Config.in +1 -3

index 9faa93f..f2b9d2f 100644
@@ -1,14 +1,37 @@
 config BR2_TARGET_ROOTFS_ISO9660
 	bool "iso image"
+	select BR2_TARGET_ROOTFS_CPIO
 	depends on (BR2_i386 || BR2_x86_64)
 	depends on BR2_LINUX_KERNEL
-	select BR2_TARGET_ROOTFS_CPIO
-	select BR2_TARGET_GRUB
-	select BR2_TARGET_GRUB_FS_ISO9660

fs/iso9660/Config.in +19 -0

+
+config BR2_TARGET_ROOTFS_ISO9660_GRUB
+	bool "grub"
+	select BR2_TARGET_GRUB
+	select BR2_TARGET_GRUB_FS_ISO9660
+	help
+	  Use the Grub bootloader for the bootable ISO9660 image.
+
+config BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
+	bool "isolinux"
+	select BR2_TARGET_SYSLINUX
+	select BR2_TARGET_SYSLINUX_ISOLINUX
+	help
+	  Use the Isolinux bootloader from the syslinux project as the
+	  ISO9660 bootable image bootloader.
+
+endchoice
+
+if BR2_TARGET_ROOTFS_ISO9660_GRUB
 
 config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
 	string "Boot menu.lst file"

@@ -17,6 +40,24 @@ config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
 	  Grub configuration
 	  Define menu, commands and options for grub

fs/iso9660/Config.in +3 -0

+
+endif # BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
+
 config BR2_TARGET_ROOTFS_ISO9660_EXTRA_FILES
 	string "Extra files copy on image"
 	default ""

fs/iso9660/bootmsg.txt new file +0 -0

new file mode 100644
index 0000000..e67951b

fs/iso9660/bootmsg.txt new file +2 -0

+  harddrive) Hard Drive (first partition)
+

fs/iso9660/iso9660.mk +0 -0

index 2f20f5b..66fd1ee 100644
@@ -12,14 +12,29 @@ ISO9660_BOOT_MENU := $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
 ISO9660_TARGET_DIR_EXTRA = $(ISO9660_TARGET_DIR)/extra
 ISO9660_LIST_EXTRA = $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_EXTRA_FILES))

fs/iso9660/iso9660.mk +5 -1

+ELTORITO_BOOT = isolinux.bin
+INITRD_SED_CMD = '/INITRD/d'
+endif
 
-$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub
+$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio $(BOOTLOADER_PACKAGE)
 	@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
 	@mkdir -p $(ISO9660_TARGET_DIR)
 	@mkdir -p $(BOOTLOADER_DIR)

@@ -29,14 +44,21 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub
 	@cp $(BOOTLOADER_SRC_CFG) $(BOOTLOADER_DST_CFG)
 	@cp $(LINUX_IMAGE_PATH) $(KERNEL_DST)
 
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
 ifeq ($(BR2_TARGET_GRUB_SPLASH),)
 	@$(SED) '/^splashimage/d' $(BOOTLOADER_DST_CFG)
 else
 	@cp boot/grub/splash.xpm.gz $(ISO9660_TARGET_DIR)/
 endif # BR2_TARGET_GRUB_SPLASH

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

+prompt 1
+LABEL buildroot
+  KERNEL bzImage
+  INITRD initrd
+
+LABEL harddrive
+  LOCALBOOT 0x80

From: jean <[email protected]>

detail : (module fs/iso9660)
option to copy file(s) on iso
option to create iso with long filenames (Joliet format) option to create iso with POSIX file system (file mode, uid, gid, ...) define volume label
define parameter input charset (for genisoimage)

Signed-off-by jean <[email protected]>

---
 fs/iso9660/Config.in  |   46 ++++++++++++++++++++++++++++++++++++-
 fs/iso9660/iso9660.mk |   61 +++++++++++++++++++++++++++++++++++++------------
 2 files changed, 92 insertions(+), 15 deletions(-)

fs/iso9660/Config.in +5 -1

index 50b4377..9faa93f 100644
@@ -8,10 +8,54 @@ 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"
+	help
+	  Grub configuration
+	  Define menu, commands and options for grub

fs/iso9660/iso9660.mk +12 -9

 $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub
 	@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
-	mkdir -p $(ISO9660_TARGET_DIR)
-	mkdir -p $(ISO9660_TARGET_DIR)/boot/grub
-	cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/
-	cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	@mkdir -p $(ISO9660_TARGET_DIR)
+	@mkdir -p $(BOOTLOADER_DIR)
+	@mkdir -p $(ISO9660_TARGET_DIR_EXTRA)
+
+	@cp $(BOOTLOADER_BIN) $(BOOTLOADER_DIR)
+	@cp $(BOOTLOADER_SRC_CFG) $(BOOTLOADER_DST_CFG)
+	@cp $(LINUX_IMAGE_PATH) $(KERNEL_DST)
+
 ifeq ($(BR2_TARGET_GRUB_SPLASH),)
-	$(SED) '/^splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	@$(SED) '/^splashimage/d' $(BOOTLOADER_DST_CFG)
 else
-	cp boot/grub/splash.xpm.gz $(ISO9660_TARGET_DIR)/
-endif
-	cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
+	@cp boot/grub/splash.xpm.gz $(ISO9660_TARGET_DIR)/
+endif # BR2_TARGET_GRUB_SPLASH
+
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
-	$(SED) '/initrd/d'  $(ISO9660_TARGET_DIR)/boot/grub/menu.lst

fs/iso9660/iso9660.mk +1 -0

+
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 	# Use fakeroot so mkisofs believes the previous fakery

fs/iso9660/iso9660.mk +10 -1

+		"-o $@ $(ISO9660_TARGET_DIR)" \
 		>> $(FAKEROOT_SCRIPT)
-	chmod a+x $(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)

@@ -49,3 +74,11 @@ rootfs-iso9660: $(BINARIES_DIR)/rootfs.iso9660
 ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y)
 TARGETS += rootfs-iso9660
 endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_JOLIET),y)
+GENISOIMAGE_OPTS += -J
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_ROCK_RIDGE),y)
+GENISOIMAGE_OPTS += -R
+endif

From: Jerome Sagnole <[email protected]>

Changelog :

patch v1 : new branch to generate iso with bootloader isolinux

patch v2 : add bootloader option for iso9660 filesystem image (isolinux)
addon to include comment Arnout Vandecappelle
simplify code
1/ I suppress redundant comment
2/ Suppress menu and use conditional (replace 'depends on' by 'if/end$ 3/ Modify comment
4/ suppress option (keyboard, ...)
5/ replace 8 x space by tabulation
File : fs/isolinux/isolinux.mk
6/ suppress extension 'BR2_'
7/ use variable 'ISOLINUX_DIR'
8/ suppress keyboard option
9/ I can't use command '$(INSTALL) -D' beacause I don't define filena$
10/ Hide command genisoimage (with option $@)

patch v3 : add bootloader option for iso9660 filesystem image (isolinux)
addon to include comment Thomas Petazzoni & Arnout Vandecappelle modify comment
default generate iso with grub bootloader
you can select isolinux bootloader
detail : (module fs/iso9660)
option to select bootloader (grub/isolinux)
file(s) bootloader configuration
option to copy file(s) on iso (only for isolinux)
option to create iso with long filenames (Joliet format) option to create iso with POSIX file system (file mode, uid, gid, ...) define volume label
define parameter input charset
can use initramfs (if activate), also cpio (like initrd)

patch v4 : add bootloader option for iso9660 filesystem image (isolinux)
addon to include comment Arnout Vandecappelle & Thomas Petazzoni add choise to select bootloader in iso9660 menu modify comment
seperate code in two patch
1st patch : update iso9660 with grub
2nd patch : add new bootloader isolinux

patch v5 part 1: modify bootloader option for iso9660 filesystem image (grub)
addon to include comment Arnout Vandecappelle & Martin Bark modify option to include files and directories in iso image
suppress option BR2_TARGET_ROOTFS_ISOLINUX_EXTRA_FILES add option BR2_TARGET_ROOTFS_ISO9660_OVERLAY
modify code to include this new option
modify comment
modify signed-off-by (use real name)
keep default option for BR2_TARGET_ROOTFS_ISO9660_ROCK_RIDGE
in old code, it defined by default (keep for compatibility)
modify default option for BR2_TARGET_ROOTFS_ISO9660_NAME modify default option for BR2_TARGET_ROOTFS_ISO9660_INPUT_CHARSET

modify variable name to add prefix 'ISO9660_'
"qstrip" each variable
BR2_TARGET_ROOTFS_ISO9660_INPUT_CHARSET BR2_TARGET_ROOTFS_ISO9660_NAME
modify command INITRD_SED_CMD
modify kernel launch for this iso
use LINUX_IMAGE_NAME
add command sed to replace __LINUX_IMAGE_NAME__ in configuration

Signed-off-by Jerome Sagnole <[email protected]>

---
 fs/iso9660/Config.in  |   49 ++++++++++++++++++++++++++++++++++-
 fs/iso9660/iso9660.mk |   68 ++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 99 insertions(+), 18 deletions(-)

fs/iso9660/Config.in +6 -1

index 50b4377..8020bd8 100644
@@ -8,10 +8,57 @@ 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"
+	help
+	  Grub configuration
+	  Define menu, commands and options for grub
+

Hello,

Quoted 56 lines · On Sat, 1 Mar 2014 22:00:55 +0100,jean.sorgemoel at laposte.net wrote:

From: Jerome Sagnole<[email protected]>

Changelog :

patch v1 : new branch to generate iso with bootloader isolinux

patch v2 : add bootloader option for iso9660 filesystem image (isolinux)
addon to include comment Arnout Vandecappelle
simplify code
1/ I suppress redundant comment
2/ Suppress menu and use conditional (replace 'depends on' by 'if/end$ 3/ Modify comment
4/ suppress option (keyboard, ...)
5/ replace 8 x space by tabulation
File : fs/isolinux/isolinux.mk
6/ suppress extension 'BR2_'
7/ use variable 'ISOLINUX_DIR'
8/ suppress keyboard option
9/ I can't use command '$(INSTALL) -D' beacause I don't define filena$
10/ Hide command genisoimage (with option $@)

patch v3 : add bootloader option for iso9660 filesystem image (isolinux)
addon to include comment Thomas Petazzoni & Arnout Vandecappelle modify comment
default generate iso with grub bootloader
you can select isolinux bootloader
detail : (module fs/iso9660)
option to select bootloader (grub/isolinux)
file(s) bootloader configuration
option to copy file(s) on iso (only for isolinux)
option to create iso with long filenames (Joliet format) option to create iso with POSIX file system (file mode, uid, gid, ...) define volume label
define parameter input charset
can use initramfs (if activate), also cpio (like initrd)

patch v4 : add bootloader option for iso9660 filesystem image (isolinux)
addon to include comment Arnout Vandecappelle & Thomas Petazzoni add choise to select bootloader in iso9660 menu modify comment
seperate code in two patch
1st patch : update iso9660 with grub
2nd patch : add new bootloader isolinux

patch v5 part 1: modify bootloader option for iso9660 filesystem image (grub)
addon to include comment Arnout Vandecappelle & Martin Bark modify option to include files and directories in iso image
suppress option BR2_TARGET_ROOTFS_ISOLINUX_EXTRA_FILES add option BR2_TARGET_ROOTFS_ISO9660_OVERLAY
modify code to include this new option
modify comment
modify signed-off-by (use real name)
keep default option for BR2_TARGET_ROOTFS_ISO9660_ROCK_RIDGE
in old code, it defined by default (keep for compatibility)
modify default option for BR2_TARGET_ROOTFS_ISO9660_NAME modify default option for BR2_TARGET_ROOTFS_ISO9660_INPUT_CHARSET

Quoted 8 lines

modify variable name to add prefix 'ISO9660_'
"qstrip" each variable
BR2_TARGET_ROOTFS_ISO9660_INPUT_CHARSET BR2_TARGET_ROOTFS_ISO9660_NAME
modify command INITRD_SED_CMD
modify kernel launch for this iso
use LINUX_IMAGE_NAME
add command sed to replace __LINUX_IMAGE_NAME__ in configuration

This changelog should go after the "---" sign below. Moreover your commit should have a proper title, like:

	fs/iso9660: <short description>

and a proper commit log, with several paragraphs explaining what the commit is changing. Your title mentions only "modify bootloader option", but your commit does *much* more than that. If your commit does multiple things, it should be split into several commits. Your commit actually seems to be doing several things:

* Adding multiple new options for ISO9660 filesystems: Joliet, RockRidge, name, input charset, overlay, etc.

* Adding the infrastructure to use different bootloaders.

Those two things should lead to two separate patches.

See also
http://buildroot.org/downloads/manual/manual.html#_patch_revision_changelog
on how to format a git commit log with a changelog.

Quoted 24 lines

Signed-off-by Jerome Sagnole<[email protected]>

---
  fs/iso9660/Config.in  |   49 ++++++++++++++++++++++++++++++++++-
  fs/iso9660/iso9660.mk |   68 ++++++++++++++++++++++++++++++++++++-------------
  2 files changed, 99 insertions(+), 18 deletions(-)

fs/iso9660/Config.in +6 -1

index 50b4377..8020bd8 100644
@@ -8,10 +8,57 @@ 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"
+	help
+	  Grub configuration
+	  Define menu, commands and options for grub
+

fs/iso9660/Config.in config BR2_TARGET_ROOTFS_ISO9660 · line 29

Quoted 10 lines

fs/iso9660/Config.in +10 -0

+config BR2_TARGET_ROOTFS_ISO9660_OVERLAY
+	string "iso9660 filesystem overlay directories"
+	default ""
+	help
+	  Specify a list of directories that are copied over the root of the
+	  iso filesystem after the build has finished and before it is
+	  packed into the iso filesystem image.
+
+	  They are copied as-is into the iso image, excluding files ending
+	  with ~ and .git, .svn and .hg directories.

I must say I'm not a big fan of this. We already have an overlay mechanism for the root filesystem. I understand that in the case of iso9660, the root filesystem as generated by Buildroot goes into the initramfs, and that there is no way to put some more stuff in the iso9660 filesystem itself (outside the initramfs), I believe that the direction we are taking here is the wrong one.

Instead, I believe we should turn the iso9660 option into what it should have been in the first place: using an iso9660 root filesystem. So we would get rid of the initramfs usage, enable Rock Ridge and Joliet extensions by default, and put the Buildroot filesystem as is in the ISO9660 filesystem. This way, no need for an additional overlay mechanism, we can just re-use the one from Buildroot.

Do you think this would be possible?

Thanks,

Thomas