KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix x86 image builder

Browse source 
SVN-Revision: 6100
This commit is contained in:
Felix Fietkau 2007-01-14 22:59:51 +00:00
parent d18161d2df
commit 6ff2e88641
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
target/linux/x86-2.6/image/Makefile
View file

@ -36,11 +36,9 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
define Image/Build/grub define Image/Build/grub
mkdir -p $(KDIR)/root.grub/boot/grub mkdir -p $(KDIR)/root.grub/boot/grub
$(CP) \ $(CP) \
$(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \ $(KDIR)/*stage* \
$(STAGING_DIR)/usr/lib/grub/i386-pc/stage2 \
$(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \
$(KDIR)/root.grub/boot/grub/ $(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 \ sed \
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(CONFIG_X86_GRUB_BOOTOPTS)#g' \ -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(CONFIG_X86_GRUB_BOOTOPTS)#g' \
-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
@ -51,6 +49,13 @@ endif
define Image/Prepare define Image/Prepare
cp $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage 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 endef
define Image/Build define Image/Build