From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 14 Jan 2007 22:59:51 +0000 (+0000)
Subject: fix x86 image builder
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=f72e9c8897b99f929d1e82265d19642ca489fbd4;p=openwrt-working-2016%2F.git

fix x86 image builder

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6100 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/x86-2.6/image/Makefile b/target/linux/x86-2.6/image/Makefile
index 44c2ff7e3b..24ac9e1fba 100644
--- a/target/linux/x86-2.6/image/Makefile
+++ b/target/linux/x86-2.6/image/Makefile
@@ -36,11 +36,9 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
   define Image/Build/grub
 	mkdir -p $(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))) $(CONFIG_X86_GRUB_BOOTOPTS)#g' \
 		-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
@@ -51,6 +49,13 @@ endif
 
 define Image/Prepare
 	cp $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage
+	# 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
 
 define Image/Build