[Buildroot] [PATCH 1/1 v2] Do not use an initrd in iso image when using initramfs
Thierry Bultel
thierry.bultel at wanadoo.fr
Mon Dec 23 21:08:13 UTC 2013
Le 23/12/2013 19:15, Yann E. MORIN a écrit :
> Thierry, All,
>
> On 2013-12-16 15:30 +0100, Thierry Bultel spake thusly:
>> From: Thierry Bultel <tbultel at basystemes.fr>
>>
>> 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 <tbultel at basystemes.fr>
>> ---
>> v2: Followed Yann E. Morin's advise to use positive logic
>> fs/iso9660/iso9660.mk | 4 ++++
>> 1 files changed, 4 insertions(+), 0 deletions(-)
>>
>> diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
>> index 979a0b2..4237d23 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 -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...
>
>> +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:
>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Thanks,
changes applied and re-submitted as v3
cheers
Thierry
>
> Regards,
> Yann E. MORIN.
>
More information about the buildroot
mailing list