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

Fix building of iso filesystem This fixes two errors when building iso filesystem:

Browse source 
a) dir root.grub/boot doesn't get created.
b) the creation of .image file by gen_image.sh which apparently is not needed
when building an iso.

Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>

SVN-Revision: 15682
This commit is contained in:
Jo-Philipp Wich 2009-05-07 13:50:09 +00:00
parent bc3538d2d2
commit 9209af2c00
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
target/linux/x86/image/Makefile
View file

@ -92,14 +92,15 @@ define Image/Build/squashfs
endef endef
define Image/Build/iso define Image/Build/iso
$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
$(CP) \ $(CP) \
$(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \ $(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \
$(KDIR)/root.grub/boot/grub/stage2_eltorito $(KDIR)/root.grub/boot/grub/stage2_eltorito
sed -i \ sed \
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \ -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
-e 's#(hd0,0)#(cd)#g' \ -e 's#(hd0,0)#(cd)#g' \
$(KDIR)/root.grub/boot/grub/menu.lst ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table \ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table \
-o $(KDIR)/root.iso $(KDIR)/root.grub -o $(KDIR)/root.iso $(KDIR)/root.grub
@ -111,9 +112,11 @@ endef
define Image/Build define Image/Build
$(call Image/Build/$(1)) $(call Image/Build/$(1))
ifneq ($(1),iso)
$(call Image/Build/grub,$(1)) $(call Image/Build/grub,$(1))
$(call Image/Build/vdi,$(1)) $(call Image/Build/vdi,$(1))
$(call Image/Build/vmdk,$(1)) $(call Image/Build/vmdk,$(1))
endif
$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs
$(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz
endef endef