From cf63744d23044ee08ee1c65d4fef94b7e42b5a58 Mon Sep 17 00:00:00 2001 From: Thierry Bultel Date: Sat, 28 Dec 2013 15:56:37 +0100 Subject: [PATCH] fs/iso9660: do not use an initrd in iso image when using initramfs When using initramfs built into the kernel, it is useless to put an initrd in the iso image. This patch makes the image to only contain the kernel image, and also removes the initrd line from menu.lst Signed-off-by: Thierry Bultel Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- fs/iso9660/iso9660.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 979a0b2fe..56e87bbb4 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -17,7 +17,11 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio 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_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel +ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) + $(SED) '/initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst +else cp $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) $(ISO9660_TARGET_DIR)/initrd +endif # 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)