Commit c7ee5853 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

iso9660: take into account the linux changes 



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent fe1cba69

fs/iso9660/Config.in

+3 −3
Original line number Diff line number Diff line 
config BR2_TARGET_ROOTFS_ISO9660

	bool "iso image"

	depends on BR2_i386

	depends on !BR2_KERNEL_none

	depends on (BR2_i386 || BR2_x86_64)

	depends on BR2_LINUX_KERNEL

	select BR2_TARGET_ROOTFS_EXT2

	select BR2_TARGET_GRUB

	help
@@ -13,4 +13,4 @@ config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU 
	default "fs/iso9660/menu.lst"



comment "iso image requires a Linux kernel to be built"

	depends on BR2_i386 && BR2_KERNEL_none
 
	depends on (BR2_i386 || BR2_x86_64) && !BR2_LINUX_KERNEL

fs/iso9660/iso9660.mk

+3 −3
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y) 
ISO9660_OPTS+=-U

endif



$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot $(LINUX_KERNEL) $(BINARIES_DIR)/rootfs.ext2 grub

$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 ext2-root 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

	cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel

	cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd

	cp $(LINUX26_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel

	cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd

	# Use fakeroot to pretend all target binaries are owned by root

	rm -f $(FAKEROOT_SCRIPT)

	touch $(BUILD_DIR)/.fakeroot.00000