Reorganize kernel configs - target/linux/*/config is now a directory.

[openwrt.git] / target / linux / x86-2.6 / image / Makefile

diff --git a/target/linux/x86-2.6/image/Makefile b/target/linux/x86-2.6/image/Makefile
index 7aa03b2..dc1d333 100644 (file)
--- a/target/linux/x86-2.6/image/Makefile
+++ b/target/linux/x86-2.6/image/Makefile
@@ -30,33 +30,45 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
   endef
 
   define Image/cmdline/ext2
-    root=$(ROOTPART) rootfstype=ext2 $(CONFIG_X86_GRUB_BOOTOPTS)
+    root=$(ROOTPART) rootfstype=ext2
   endef
 
   define Image/Build/grub
-       mkdir -p $(KDIR)/root.grub/boot/grub
+       # left here because the image builder doesnt need these
+       $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
        $(CP) \
-               $(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \
-               $(STAGING_DIR)/usr/lib/grub/i386-pc/stage2 \
-               $(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \
+               $(KDIR)/*stage* \
                $(KDIR)/root.grub/boot/grub/
-       $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/root.grub/boot/vmlinuz
+       $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
        sed \
-               -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#g' \
+               -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(CONFIG_X86_GRUB_BOOTOPTS)#g' \
                -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
                ./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
        PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
   endef
 endif
 
+ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
+  define Image/Prepare/grub
+       # for the image builder
+       $(CP) \
+               $(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \
+               $(STAGING_DIR)/usr/lib/grub/i386-pc/stage2 \
+               $(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \
+               $(KDIR)/
+       $(CP) $(STAGING_DIR)/usr/sbin/grub $(STAGING_DIR)/bin
+  endef
+endif
+
+define Image/Prepare
+       $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage
+       $(call Image/Prepare/grub)
+endef
+
 define Image/Build
        $(call Image/Build/grub,$(1))
-       cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs
-       cp $(LINUX_DIR)/arch/i386/boot/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz
+       $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs
+       $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz
 endef
 
 $(eval $(call BuildImage))
-
-$(eval $(call RequireCommand,fdisk, \
-       Please install fdisk \
-))