X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f57a96e32d600416f1d9421818328972c7149ea6..7e638bc2e1120b149feb5c0050cfe38bc0f9c7a8:/target/linux/x86/image/Makefile diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 095d40240..db83e324c 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -40,7 +40,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y) sed \ -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \ -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ - ./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst + ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_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) $(call Image/Build/grub/$(1)) endef @@ -85,8 +85,8 @@ define Image/BuildKernel endef define Image/Build - $(call Image/Build/$(1)) $(call Image/Build/grub,$(1)) + $(call Image/Build/$(1)) $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz endef