|
@@ -2,7 +2,7 @@ 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
|
|
|
+ depends on BR2_TARGET_GRUB || BR2_TARGET_SYSLINUX_ISOLINUX
|
|
|
select BR2_LINUX_KERNEL_INSTALL_TARGET \
|
|
|
if (!BR2_TARGET_ROOTFS_ISO9660_INITRD && !BR2_TARGET_ROOTFS_INITRAMFS)
|
|
|
help
|
|
@@ -29,15 +29,22 @@ config BR2_TARGET_ROOTFS_ISO9660_GRUB
|
|
|
depends on BR2_TARGET_GRUB
|
|
|
select BR2_TARGET_GRUB_FS_ISO9660
|
|
|
|
|
|
+config BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
|
|
|
+ bool "isolinux"
|
|
|
+ depends on BR2_TARGET_SYSLINUX_ISOLINUX
|
|
|
+
|
|
|
endchoice
|
|
|
|
|
|
config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
|
|
|
string "Boot menu.lst file"
|
|
|
default "fs/iso9660/menu.lst" if BR2_TARGET_ROOTFS_ISO9660_GRUB
|
|
|
+ default "fs/iso9660/isolinux.cfg" if BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
|
|
|
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
|
|
|
+ Use this option to provide a custom bootloader configuration
|
|
|
+ file (menu.lst for Grub, isolinux.cfg for isolinux).
|
|
|
+
|
|
|
+ Note that the strings __KERNEL_PATH__ and __INITRD_PATH__
|
|
|
+ will automatically be replaced by the path to the kernel and
|
|
|
initrd images respectively.
|
|
|
|
|
|
config BR2_TARGET_ROOTFS_ISO9660_INITRD
|
|
@@ -53,6 +60,7 @@ config BR2_TARGET_ROOTFS_ISO9660_INITRD
|
|
|
|
|
|
endif
|
|
|
|
|
|
-comment "iso image needs a Linux kernel and grub to be built"
|
|
|
+comment "iso image needs a Linux kernel and one of grub or isolinux to be built"
|
|
|
depends on BR2_i386 || BR2_x86_64
|
|
|
- depends on !BR2_LINUX_KERNEL || !BR2_TARGET_GRUB
|
|
|
+ depends on !BR2_LINUX_KERNEL || \
|
|
|
+ !(BR2_TARGET_GRUB || BR2_TARGET_SYSLINUX_ISOLINUX)
|