From patchwork Mon Dec 16 14:30:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Bultel X-Patchwork-Id: 301730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 3419C2C0085 for ; Tue, 17 Dec 2013 01:20:21 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 773A680ADD; Mon, 16 Dec 2013 14:20:20 +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 DTDg7ajm19Ar; Mon, 16 Dec 2013 14:20:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id CA0AC80AF8; Mon, 16 Dec 2013 14:20:19 +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 E21DE1BF9D5 for ; Mon, 16 Dec 2013 14:20:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DE9CB80AF8 for ; Mon, 16 Dec 2013 14:20:18 +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 akfsC-DjzDjv for ; Mon, 16 Dec 2013 14:20:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.basystemes.fr (226.96.7.109.rev.sfr.net [109.7.96.226]) by whitealder.osuosl.org (Postfix) with ESMTP id 8C0CC80ADD for ; Mon, 16 Dec 2013 14:20:17 +0000 (UTC) Received: from akela.basystemes.fr (localhost [127.0.0.1]) by mail.basystemes.fr (Postfix) with ESMTP id A1D2D1715A for ; Mon, 16 Dec 2013 15:20:15 +0100 (CET) X-Virus-Scanned: amavisd-new at basystemes.fr Received: from mail.basystemes.fr ([127.0.0.1]) by akela.basystemes.fr (akela.basystemes.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EjpFGyEhhqqq; Mon, 16 Dec 2013 15:20:11 +0100 (CET) Received: from localhost.localdomain (laois.basystemes.fr [192.168.35.245]) by mail.basystemes.fr (Postfix) with ESMTP id 23CE717155; Mon, 16 Dec 2013 15:20:11 +0100 (CET) From: Thierry Bultel To: buildroot@busybox.net Date: Mon, 16 Dec 2013 15:30:37 +0100 Message-Id: <1387204237-4347-1-git-send-email-thierry.bultel@wanadoo.fr> X-Mailer: git-send-email 1.7.0.4 Cc: Thierry Bultel Subject: [Buildroot] [PATCH 1/1 v2] 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 From: Thierry Bultel 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 Reviewed-by: "Yann E. MORIN" --- 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)