Do not use an initrd in iso image when using initramfs
PATCH v2 1/1 Do not use an initrd in iso image when using initramfs
From: Thierry Bultel <[email protected]>
When using initramfs, 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
---
v2: Followed Yann E. Morin's advise to use positive logic
fs/iso9660/iso9660.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
fs/iso9660/iso9660.mk +4 -0
@@ -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 -i -e '/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)
Signature · 1 line
1.7.0.4
PATCH v2 1/1 Do not use an initrd in iso image when using initramfs
Thierry, All,
On 2013-12-16 15:30 +0100, Thierry Bultel spake thusly:
Quoted 17 lines
From: Thierry Bultel <[email protected]>
When using initramfs, 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 <[email protected]>---
v2: Followed Yann E. Morin's advise to use positive logicfs/iso9660/iso9660.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)fs/iso9660/iso9660.mk +0
-0
fs/iso9660/iso9660.mk $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub · line 21
Quoted 5 lines
fs/iso9660/iso9660.mk +2
-0@@ -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 -i -e '/initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
Use $(SED) instead of 'sed -i -e'
grep -n '^SED' package/Makefile.in
196:SED:=$(shell which sed || type -p sed) -i -e
Sorry, I missed that on the previous review...
fs/iso9660/iso9660.mk $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub · line 27
Quoted 6 lines
fs/iso9660/iso9660.mk +2
-0+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)
Otherwise, looks good to me. So, with that fixed:
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/1 Do not use an initrd in iso image when using initramfs
Le 23/12/2013 19:15, Yann E. MORIN a ?crit :
Quoted 42 lines
Thierry, All,
On 2013-12-16 15:30 +0100, Thierry Bultel spake thusly:
Quoted 17 lines
From: Thierry Bultel <[email protected]>
When using initramfs, 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 <[email protected]>---
v2: Followed Yann E. Morin's advise to use positive logicfs/iso9660/iso9660.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)fs/iso9660/iso9660.mk +0
-0fs/iso9660/iso9660.mk $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub · line 21
Quoted 5 lines
fs/iso9660/iso9660.mk +2
-0@@ -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 -i -e '/initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lstUse $(SED) instead of 'sed -i -e'
grep -n '^SED' package/Makefile.in
196:SED:=$(shell which sed || type -p sed) -i -eSorry, I missed that on the previous review...
fs/iso9660/iso9660.mk $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub · line 27
Quoted 6 lines
fs/iso9660/iso9660.mk +2
-0+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)Otherwise, looks good to me. So, with that fixed:
Quoted 1 line
Reviewed-by "Yann E. MORIN" <[email protected]>
Thanks,
changes applied and re-submitted as v3
cheers
Thierry
Quoted 4 lines
Regards,
Yann E. MORIN.