diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-07 13:50:09 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-07 13:50:09 +0000 |
| commit | df2bb6497f63851a3a77c244cbde3bc3a01f41e3 (patch) | |
| tree | 8133c3219959069d5da70b59091843f0f0550b16 /target/linux/x86/image/Makefile | |
| parent | 78b84f66b7002888b061e21b8bcdd0e1418be4a4 (diff) | |
| download | upstream-df2bb6497f63851a3a77c244cbde3bc3a01f41e3.tar.gz upstream-df2bb6497f63851a3a77c244cbde3bc3a01f41e3.tar.bz2 upstream-df2bb6497f63851a3a77c244cbde3bc3a01f41e3.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15682 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/image/Makefile')
| -rw-r--r-- | target/linux/x86/image/Makefile | 7 |
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 |