[Buildroot] [PATCH 6/9] fs/iso9660: do not use an initrd in iso image when using initramfs
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Sat Dec 28 14:56:37 UTC 2013
From: Thierry Bultel <thierry.bultel at wanadoo.fr>
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 at wanadoo.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
fs/iso9660/iso9660.mk | 4 ++++
1 file changed, 4 insertions(+)
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)
--
1.8.3.2
More information about the buildroot
mailing list