Changeset 1710

Show
Ignore:
Timestamp:
12/08/10 10:59:04 (3 years ago)
Author:
matthijs
Message:

Make image generation a bit more consistent between 2.0g and 2.0n.

The filenames of the 2.0g image is now similar to the 2.0n image (they both
include -squashfs now). Also, for 2.0g, there are no extra kernel-only images
generated anymore, which were never used. For 2.0n, make the Makefile a bit
more general.

Location:
trunk/openwrt/target/linux
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/openwrt/target/linux/fonera2/image/Makefile

    r16 r1710  
    3131 
    3232define Image/BuildKernel 
    33         cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.elf 
    3433        $(STAGING_DIR_HOST)/bin/lzma e -so -eos -lc1 -lp2 -pb2 $(KDIR)/vmlinux > $(KDIR)/vmlinux.lzma 
    35         ./fonimage.pl $(KDIR)/vmlinux.image $(KDIR)/vmlinux.lzma 
    36         dd if=$(KDIR)/vmlinux.image of=$(BIN_DIR)/openwrt-$(BOARD)-vmlinux.image bs=65536 conv=sync 
    3734endef 
    3835 
    3936define Image/Build/squashfs 
    40         ./fonimage.pl $(BIN_DIR)/openwrt-$(BOARD).image $(KDIR)/vmlinux.lzma $(KDIR)/root.$(1) 
    41         $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(BOARD).image) 
     37        # Join kernel and rootfs together with a header for the Meraki 
     38        # loader 
     39        ./fonimage.pl $(BIN_DIR)/openwrt-$(BOARD)-$(1).img $(KDIR)/vmlinux.lzma $(KDIR)/root.$(1) 
     40        # Align and append a JFFS marker 
     41        $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(BOARD)-$(1).img) 
    4242endef 
    4343 

  • trunk/openwrt/target/linux/fonera2n/image/Makefile

    r1225 r1710  
    4242 
    4343define Image/Build/squashfs 
    44         $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) 
     44        # Align and append a JFFS marker 
     45        $(call prepare_generic_squashfs,$(KDIR)/root.$(1)) 
    4546endef 
    4647 
    4748define Image/Build 
    48         $(call Image/Build/$(1)) 
     49        $(call Image/Build/$(1),$(1)) 
    4950        ( \ 
    5051                dd if=$(KDIR)/uImage.lzma bs=1024k conv=sync; \ 
    5152                dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \ 
    5253        ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img 
    53         #( \ 
    54         #       cat $(KDIR)/uImage.lzma ;\ 
    55         #       dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \ 
    56         #) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img 
    5754endef 
    5855