Changeset 15682


Ignore:
Timestamp:
2009-05-07T15:50:09+02:00 (9 years ago)
Author:
jow
Message:

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/x86/image/Makefile

    r15245 r15682  
    9393 
    9494define Image/Build/iso  
     95        $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub 
    9596        $(CP) \ 
    9697                $(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \ 
    9798                $(KDIR)/root.grub/boot/grub/stage2_eltorito  
    98         sed -i \ 
     99        sed \ 
    99100                -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \ 
    100101                -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ 
    101102                -e 's#(hd0,0)#(cd)#g' \ 
    102                  $(KDIR)/root.grub/boot/grub/menu.lst  
     103                ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst 
    103104        $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz  
    104105        mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table \ 
     
    112113define Image/Build 
    113114        $(call Image/Build/$(1)) 
     115ifneq ($(1),iso) 
    114116        $(call Image/Build/grub,$(1)) 
    115117        $(call Image/Build/vdi,$(1)) 
    116118        $(call Image/Build/vmdk,$(1)) 
     119endif 
    117120        $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs 
    118121        $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz 
Note: See TracChangeset for help on using the changeset viewer.