From e25696afb0d450e5c7bc7c4be2e2a4275c5722f3 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 21 Nov 2008 12:02:39 +0100 Subject: [PATCH] Make grub config deal with initramfs If the kernel does not have an initramfs, use an initrd. Do not use an initrd in the filesystem if the kernel does indeed have an initramfs. --- target/iso9660/iso9660.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk index 3e3820d..de77e91 100644 --- a/target/iso9660/iso9660.mk +++ b/target/iso9660/iso9660.mk @@ -56,12 +56,17 @@ endif $(ISO9660_TARGET): host-fakeroot $(LINUX_KERNEL) $(EXT2_TARGET) grub mkisofs rm -rf $(ISO9660_TARGET_DIR) - mkdir -p $(ISO9660_TARGET_DIR)/boot/grub + $(INSTALL) -d $(ISO9660_TARGET_DIR)/boot/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_KERNEL) $(ISO9660_TARGET_DIR)/kernel -ifneq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) +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 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