X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Fx86%2Fimage%2FMakefile;h=dd147b869a952ab678af81cc16a38b8e01f4d466;hb=db6034ebcf8ecd7a512630a2903405f355b87755;hp=d470fe1c5f6e012f6a5f37029718f096542ccf82;hpb=58b2f95a8711a73dd7c031f087725476a09769db;p=openwrt-10.03%2F.git

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index d470fe1c5..dd147b869 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -14,14 +14,6 @@ ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART)))
 
 
 ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
-  define Build/Compile
-	$(MAKE) -C grub compile
-  endef
-
-  define Build/Clean
-	$(MAKE) -C grub clean
-  endef
-
   define Image/cmdline/squashfs
     block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs init=/etc/preinit
   endef
@@ -48,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