summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Bultel <thierry.bultel@wanadoo.fr>2013-12-28 14:56:37 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-12-29 17:26:54 (GMT)
commitcf63744d23044ee08ee1c65d4fef94b7e42b5a58 (patch)
tree9975bdb92cee2323be88ab99d3bb684b8b13fd9f
parent183b10817262121317b030e96d34d193622109c9 (diff)
downloadbuildroot-cf63744d23044ee08ee1c65d4fef94b7e42b5a58.tar.gz
buildroot-cf63744d23044ee08ee1c65d4fef94b7e42b5a58.tar.bz2
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 <thierry.bultel@wanadoo.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--fs/iso9660/iso9660.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 979a0b2..56e87bb 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)