diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-01-14 22:59:51 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-01-14 22:59:51 +0000 |
| commit | ca56d9e6558ec2077ed4dfe14e658ae9d4db7638 (patch) | |
| tree | 54e41ddd830e29dea56fc4a2527d624bd0749a51 /target/linux/x86-2.6 | |
| parent | a455d0988cc20d251b17036669991e5125bf65da (diff) | |
| download | upstream-ca56d9e6558ec2077ed4dfe14e658ae9d4db7638.tar.gz upstream-ca56d9e6558ec2077ed4dfe14e658ae9d4db7638.tar.bz2 upstream-ca56d9e6558ec2077ed4dfe14e658ae9d4db7638.zip | |
fix x86 image builder
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6100 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86-2.6')
| -rw-r--r-- | target/linux/x86-2.6/image/Makefile | 13 |
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 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 |