Changeset 303


Ignore:
Timestamp:
2005-03-04T05:35:15+01:00 (13 years ago)
Author:
mbm
Message:

fix the jffs2 build for separate 4M/8M images

Location:
trunk/openwrt
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/Makefile

    r301 r303  
    8383 
    8484world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS) 
     85        @echo DONE. 
    8586 
    8687.PHONY: all world clean dirclean distclean source $(TARGETS) \ 
  • trunk/openwrt/target/Makefile.in

    r301 r303  
    11# Default target skeleton stuff, may be overridden 
    2 EXTRAVERSION= 
     2EXTRAVERSION:= 
     3XXX:= 
    34TARGET_SKELETON=target/default/skel.tar.gz 
    45TARGET_SKEL_DIR=target/default/target_skeleton 
     
    1112endif 
    1213 
    13  
    1414openwrt-linux.trx: openwrt-trx 
    15         PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \ 
     15        @PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \ 
    1616         $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS) 
    1717 
    18 openwrt-gs-code.bin: openwrt-addpattern openwrt-linux.trx 
    19         PATH=$(TARGET_PATH) addpattern -2 -i  openwrt-linux$(EXTRAVERSION).trx \ 
    20         -o openwrt-gs-code$(EXTRAVERSION).bin -g 
     18openwrt-code.bin: openwrt-addpattern openwrt-linux.trx 
     19        @PATH=$(TARGET_PATH) addpattern -2 -i  openwrt-linux$(EXTRAVERSION).trx \ 
     20        -o openwrt-$(TAG)-code$(EXTRAVERSION).bin -g 
     21        @sed -i -e "1s,^W54S,$(TAG)," openwrt-$(TAG)-code$(EXTRAVERSION).bin 
    2122 
    22 openwrt-g-code.bin: openwrt-gs-code.bin 
    23         sed -e "1s,^W54S,W54G," < openwrt-gs-code$(EXTRAVERSION).bin > openwrt-g-code$(EXTRAVERSION).bin 
    24  
    25 openwrt-image:  openwrt openwrt-g-code.bin 
     23ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) 
     24else 
     25endif 
    2626 
    2727openwrt-image-clean:  
  • trunk/openwrt/target/jffs2/jffs2root.mk

    r301 r303  
    44# 
    55############################################################# 
    6  
    7 include target/jffs2/blocksize.mk 
    86 
    97MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig 
     
    4745 
    4846ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) 
    49 TARGETS+=jffs2root openwrt-image 
     47TARGETS+=openwrt-image 
    5048ROOTFS=jffs2 
     49 
     50openwrt-image:  openwrt 
     51        @make jffs2root openwrt-code.bin TAG=W54G \ 
     52        EXTRAVERSION=$(EXTRAVERSION)-JFFS2-4M JFFS2_BLOCK_SIZE=0x10000 
     53        @make jffs2root openwrt-code.bin TAG=W54S \ 
     54        EXTRAVERSION=$(EXTRAVERSION)-JFFS2-8M JFFS2_BLOCK_SIZE=0x20000 
    5155endif 
  • trunk/openwrt/target/squashfs-lzma/squashfslzmaroot.mk

    r294 r303  
    4040        @rm -rf $(TARGET_DIR)/usr/man 
    4141        @rm -rf $(TARGET_DIR)/usr/info 
    42         $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le 
     42        $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma \ 
     43        $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le 
    4344 
    4445squashfslzmaroot-source: squashfslzma-source 
     
    5354TARGETS+=squashfslzmaroot openwrt-image 
    5455ROOTFS=squashfslzma 
     56 
     57openwrt-image:  openwrt 
     58        @make openwrt-code.bin TAG=W54G \ 
     59        EXTRAVERSION=$(EXTRAVERSION)-SQUASHFSLZMA 
     60        @make openwrt-code.bin TAG=W54S \ 
     61        EXTRAVERSION=$(EXTRAVERSION)-SQUASHFSLZMA 
    5562endif 
Note: See TracChangeset for help on using the changeset viewer.