summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-14 22:59:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-14 22:59:51 +0000
commit6ff2e88641a0db7bb05e9fc6b94556eb3243469c (patch)
treeeee677b786756f9c6659c2347165a95f2bea7e1e /target
parentd18161d2dfe15efebe2a25a06895bdc1eb04bf71 (diff)
downloadmtk-20170518-6ff2e88641a0db7bb05e9fc6b94556eb3243469c.zip
mtk-20170518-6ff2e88641a0db7bb05e9fc6b94556eb3243469c.tar.gz
mtk-20170518-6ff2e88641a0db7bb05e9fc6b94556eb3243469c.tar.bz2
fix x86 image builder
SVN-Revision: 6100
Diffstat (limited to 'target')
-rw-r--r--target/linux/x86-2.6/image/Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/target/linux/x86-2.6/image/Makefile b/target/linux/x86-2.6/image/Makefile
index 44c2ff7..24ac9e1 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