From patchwork Sun Dec 15 20:50:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Bultel X-Patchwork-Id: 301396 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id CC9052C007E for ; Mon, 16 Dec 2013 07:50:53 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D633E86B96; Sun, 15 Dec 2013 20:50:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mxxnetFcuc3i; Sun, 15 Dec 2013 20:50:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D3A3D858D1; Sun, 15 Dec 2013 20:50:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 30DBC1C29D5 for ; Sun, 15 Dec 2013 20:50:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 29641856CD for ; Sun, 15 Dec 2013 20:50:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 067ZnAtB9q+C for ; Sun, 15 Dec 2013 20:50:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp.smtpout.orange.fr (smtp03.smtpout.orange.fr [80.12.242.125]) by whitealder.osuosl.org (Postfix) with ESMTP id 722B480C19 for ; Sun, 15 Dec 2013 20:50:49 +0000 (UTC) Received: from thierry-desktop ([78.221.72.141]) by mwinf5d58 with ME id 1wqm1n00732tu5203wqmrQ; Sun, 15 Dec 2013 21:50:48 +0100 From: Thierry Bultel To: buildroot@busybox.net Date: Sun, 15 Dec 2013 21:50:44 +0100 Message-Id: <1387140644-22545-1-git-send-email-thierry.bultel@wanadoo.fr> X-Mailer: git-send-email 1.7.1 Cc: Thierry Bultel Subject: [Buildroot] [PATCH 1/1] Do not use an initrd in iso image when using initramfs X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- 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..1f9c62e 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 +ifneq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) cp $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) $(ISO9660_TARGET_DIR)/initrd +else + sed -i -e '/initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst +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)