All of lore.kernel.org
 help / color / mirror / Atom feed
From: Assaf Inbal <shmuelzon@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] iso9660 fs: no need to copy initrd when using initramfs
Date: Thu, 22 Aug 2013 08:09:26 +0300	[thread overview]
Message-ID: <1377148166-21030-2-git-send-email-shmuelzon@gmail.com> (raw)
In-Reply-To: <1377148166-21030-1-git-send-email-shmuelzon@gmail.com>

Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
---
 fs/iso9660/iso9660.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 317314a..12ab9eb 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -21,7 +21,9 @@ $(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
-	cp $(BINARIES_DIR)/rootfs.cpio$(ISO9660_CPIO_EXT-y) $(ISO9660_TARGET_DIR)/initrd
+	if [ "$(BR2_TARGET_ROOTFS_INITRAMFS)" != "y" ]; then \
+	  cp $(BINARIES_DIR)/rootfs.cpio$(ISO9660_CPIO_EXT-y) $(ISO9660_TARGET_DIR)/initrd; \
+	fi
 	# 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.9.5

  reply	other threads:[~2013-08-22  5:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-22  5:09 [Buildroot] initrd isn't needed for iso9660 when initramfs is used Assaf Inbal
2013-08-22  5:09 ` Assaf Inbal [this message]
2013-08-22  5:56 ` Arnout Vandecappelle
2013-08-22  8:42   ` Assaf Inbal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377148166-21030-2-git-send-email-shmuelzon@gmail.com \
    --to=shmuelzon@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.