This fixes two errors when building iso filesystem:
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_tsiligian...@silverton.gr>
---
trunk/target/linux/x86/image/Makefile | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/trunk/target/linux/x86/image/Makefile
b/trunk/target/linux/x86/image/Makefile
index 2bdfba5..e64fa19 100644
--- a/trunk/target/linux/x86/image/Makefile
+++ b/trunk/target/linux/x86/image/Makefile
@@ -92,14 +92,15 @@ define Image/Build/squashfs
endef
define Image/Build/iso
+ $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
$(CP) \
$(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \
$(KDIR)/root.grub/boot/grub/stage2_eltorito
- sed -i \
+ sed \
-e 's...@cmdline@#$(strip $(call Image/cmdline/$(1)))
$(BOOTOPTS)#g' \
-e 's...@baudrate@#$(CONFIG_X86_GRUB_BAUDRATE)#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
mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4
-boot-info-table \
-o $(KDIR)/root.iso $(KDIR)/root.grub
@@ -111,9 +112,11 @@ endef
define Image/Build
$(call Image/Build/$(1))
+ifneq ($(1),iso)
$(call Image/Build/grub,$(1))
$(call Image/Build/vdi,$(1))
$(call Image/Build/vmdk,$(1))
+endif
$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs
$(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz
endef
--
1.5.4.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
