* [Buildroot] [PATCH 1/1 v2] Do not use an initrd in iso image when using initramfs
@ 2013-12-16 14:30 Thierry Bultel
2013-12-23 18:15 ` Yann E. MORIN
0 siblings, 1 reply; 3+ messages in thread
From: Thierry Bultel @ 2013-12-16 14:30 UTC (permalink / raw)
To: buildroot
From: Thierry Bultel <tbultel@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@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
+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.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1 v2] Do not use an initrd in iso image when using initramfs
2013-12-16 14:30 [Buildroot] [PATCH 1/1 v2] Do not use an initrd in iso image when using initramfs Thierry Bultel
@ 2013-12-23 18:15 ` Yann E. MORIN
2013-12-23 21:08 ` Thierry Bultel
0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2013-12-23 18:15 UTC (permalink / raw)
To: buildroot
Thierry, All,
On 2013-12-16 15:30 +0100, Thierry Bultel spake thusly:
> From: Thierry Bultel <tbultel@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@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@free.fr>
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1 v2] Do not use an initrd in iso image when using initramfs
2013-12-23 18:15 ` Yann E. MORIN
@ 2013-12-23 21:08 ` Thierry Bultel
0 siblings, 0 replies; 3+ messages in thread
From: Thierry Bultel @ 2013-12-23 21:08 UTC (permalink / raw)
To: buildroot
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@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@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@free.fr>
Thanks,
changes applied and re-submitted as v3
cheers
Thierry
>
> Regards,
> Yann E. MORIN.
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-23 21:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-16 14:30 [Buildroot] [PATCH 1/1 v2] Do not use an initrd in iso image when using initramfs Thierry Bultel
2013-12-23 18:15 ` Yann E. MORIN
2013-12-23 21:08 ` Thierry Bultel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox