From 7be47a7657c7aa929cda3f57a6a1102bd4a3d3c1 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 21 Nov 2008 12:08:17 +0100 Subject: [PATCH] delete unneeded initrd config lines in menu.lst We copy our menu.lst anyway, so we don't need a toggle. --- target/iso9660/iso9660.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk index de77e91..780d0cb 100644 --- a/target/iso9660/iso9660.mk +++ b/target/iso9660/iso9660.mk @@ -61,12 +61,9 @@ $(ISO9660_TARGET): host-fakeroot $(LINUX_KERNEL) $(EXT2_TARGET) grub mkisofs cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),) - $(SED) '/^#/s,#[[:space:]]*\(initrd.*\),\1,g' \ - $(ISO9660_TARGET_DIR)/boot/grub/menu.lst -else $(INSTALL) $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd - $(SED) '/^initrd/s,\(initrd.*\),#\1,g' \ - $(ISO9660_TARGET_DIR)/boot/grub/menu.lst +else + $(SED) '/^initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst endif # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) -- 2.11.4.GIT