| Message ID | 1433430330-2166-13-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Superseded |
| Headers | show |
Thomas, all, On Thu, Jun 4, 2015 at 5:05 PM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > 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 <thomas.petazzoni@free-electrons.com> Reviewed-by: Samuel Martin <s.martin49@gmail.com> Regards,
Thomas, All, On 2015-06-04 17:05 +0200, Thomas Petazzoni spake thusly: > 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 <thomas.petazzoni@free-electrons.com> [--SNIP--] > -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 /me should sometime go back to the real world! :-] > diff --git a/fs/iso9660/grub.cfg b/fs/iso9660/grub.cfg > new file mode 100644 > index 0000000..b8329c3 > --- /dev/null > +++ b/fs/iso9660/grub.cfg > @@ -0,0 +1,7 @@ > +set default="0" > +set timeout="5" > + > +menuentry "Buildroot" { > + linux __KERNEL_PATH__ root=/dev/sr0 console=tty1 Why do you forcibly pass the console setting? > + initrd __INITRD_PATH__ > +} Regards, Yann E. MORIN.
Dear Yann E. MORIN, On Sat, 6 Jun 2015 01:07:56 +0200, Yann E. MORIN wrote: > > -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 ? :-) > > +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! Thomas
Thomas, All, On 2015-06-06 02:59 +0200, Thomas Petazzoni spake thusly: > Dear Yann E. MORIN, > > On Sat, 6 Jun 2015 01:07:56 +0200, Yann E. MORIN wrote: > > > > -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 ? :-) iso image needs a Linux kernel and one of grub, grub2 or isolinux > > > +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! He! :-) Regards, Yann E. MORIN.
diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in index 1b1f090..0bd09b9 100644 --- a/fs/iso9660/Config.in +++ b/fs/iso9660/Config.in @@ -2,7 +2,9 @@ config BR2_TARGET_ROOTFS_ISO9660 bool "iso image" depends on (BR2_i386 || BR2_x86_64) depends on BR2_LINUX_KERNEL - depends on BR2_TARGET_GRUB || BR2_TARGET_SYSLINUX_ISOLINUX + depends on BR2_TARGET_GRUB || \ + BR2_TARGET_GRUB2 || \ + BR2_TARGET_SYSLINUX_ISOLINUX select BR2_LINUX_KERNEL_INSTALL_TARGET \ if (!BR2_TARGET_ROOTFS_ISO9660_INITRD && !BR2_TARGET_ROOTFS_INITRAMFS) help @@ -29,6 +31,15 @@ config BR2_TARGET_ROOTFS_ISO9660_GRUB depends on BR2_TARGET_GRUB select BR2_TARGET_GRUB_FS_ISO9660 +config BR2_TARGET_ROOTFS_ISO9660_GRUB2 + bool "grub2" + depends on BR2_TARGET_GRUB2 + help + Use Grub 2 as the bootloader for the ISO9660 image. Make + sure to enable the 'iso9660' module in + BR2_TARGET_GRUB2_BUILTIN_MODULES and to use 'cd' as the boot + partition in BR2_TARGET_GRUB2_BOOT_PARTITION=. + config BR2_TARGET_ROOTFS_ISO9660_ISOLINUX bool "isolinux" depends on BR2_TARGET_SYSLINUX_ISOLINUX @@ -38,6 +49,7 @@ endchoice config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU string "Bootloader configuration file" default "fs/iso9660/menu.lst" if BR2_TARGET_ROOTFS_ISO9660_GRUB + default "fs/iso9660/grub.cfg" if BR2_TARGET_ROOTFS_ISO9660_GRUB2 default "fs/iso9660/isolinux.cfg" if BR2_TARGET_ROOTFS_ISO9660_ISOLINUX help Use this option to provide a custom bootloader configuration @@ -69,7 +81,7 @@ config BR2_TARGET_ROOTFS_ISO9660_HYBRID endif -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" depends on BR2_i386 || BR2_x86_64 depends on !BR2_LINUX_KERNEL || \ - !(BR2_TARGET_GRUB || BR2_TARGET_SYSLINUX_ISOLINUX) + !(BR2_TARGET_GRUB || BR2_TARGET_GRUB2 || BR2_TARGET_SYSLINUX_ISOLINUX) diff --git a/fs/iso9660/grub.cfg b/fs/iso9660/grub.cfg new file mode 100644 index 0000000..b8329c3 --- /dev/null +++ b/fs/iso9660/grub.cfg @@ -0,0 +1,7 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux __KERNEL_PATH__ root=/dev/sr0 console=tty1 + initrd __INITRD_PATH__ +} diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 792a770..9378d50 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -49,6 +49,15 @@ 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_GRUB2),y) +ROOTFS_ISO9660_DEPENDENCIES += grub2 +ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \ + $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub.cfg +ROOTFS_ISO9660_BOOT_IMAGE = boot/grub/grub-eltorito.img +define ROOTFS_ISO9660_INSTALL_BOOTLOADER + $(INSTALL) -D -m 0644 $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE)/grub-eltorito.img \ + $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub-eltorito.img +endef else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_ISOLINUX),y) ROOTFS_ISO9660_DEPENDENCIES += syslinux ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
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 <thomas.petazzoni@free-electrons.com> --- fs/iso9660/Config.in | 18 +++++++++++++++--- fs/iso9660/grub.cfg | 7 +++++++ fs/iso9660/iso9660.mk | 9 +++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 fs/iso9660/grub.cfg