aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-05-07 13:50:09 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-05-07 13:50:09 +0000
commit9209af2c00a71d3b1fe1bf427986a64f259ea95e (patch)
tree8f604cb578adb200c302c5946b6f897b603adf88
parentbc3538d2d218d89c845d9e6ab71b39ab38886e46 (diff)
downloadupstream-9209af2c00a71d3b1fe1bf427986a64f259ea95e.tar.gz
upstream-9209af2c00a71d3b1fe1bf427986a64f259ea95e.tar.bz2
upstream-9209af2c00a71d3b1fe1bf427986a64f259ea95e.zip
Fix building of iso filesystem 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_tsiligiannis@silverton.gr> SVN-Revision: 15682
-rw-r--r--target/linux/x86/image/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 2bdfba5d0e..e64fa19925 100644
--- a/target/linux/x86/image/Makefile
+++ b/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