Changeset 243


Ignore:
Timestamp:
2005-02-12T07:12:34+01:00 (13 years ago)
Author:
mbm
Message:

cleanup the whole addpattern / trx nonsense

Location:
trunk/openwrt
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/openwrt/openwrt.mk

    r231 r243  
    100100# trx tool 
    101101OPENWRT_TRX_SOURCE=package/openwrt/trx.c 
    102 OPENWRT_TRX_TARGET=$(BUILD_DIR)/trx 
     102OPENWRT_TRX_TARGET=$(STAGING_DIR)/bin/trx 
    103103 
    104104$(OPENWRT_TRX_TARGET):  
     
    109109# addpattern tool 
    110110OPENWRT_ADDPATTERN_SOURCE=package/openwrt/addpattern.c 
    111 OPENWRT_ADDPATTERN_TARGET=$(BUILD_DIR)/addpattern 
     111OPENWRT_ADDPATTERN_TARGET=$(STAGING_DIR)/bin/addpattern 
    112112 
    113113$(OPENWRT_ADDPATTERN_TARGET):  
  • trunk/openwrt/target/Config.in

    r209 r243  
    1 # 
    2  
    3 menu "Target Filesystem" 
    4  
    5 source "target/jffs2/Config.in" 
    6 source "target/squashfs/Config.in" 
    7  
    8 endmenu 
    9  
     1choice 
     2        prompt "Target Root Filesystem" 
     3        source "target/jffs2/Config.in" 
     4        source "target/squashfs/Config.in" 
     5endchoice 
  • trunk/openwrt/target/jffs2/Config.in

    r197 r243  
    11config BR2_TARGET_ROOTFS_JFFS2 
    2         bool "jffs2 root filesystem for the target device" 
     2        bool "jffs2" 
    33        default n 
    44        help 
  • trunk/openwrt/target/jffs2/Makefile.in

    r241 r243  
    11ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) 
    22TARGETS+=jffs2root openwrt-image-jffs2 
     3ROOTFS=jffs2 
    34endif 
  • trunk/openwrt/target/jffs2/jffs2root.mk

    r241 r243  
    4545jffs2root-dirclean: 
    4646        rm -rf $(MTD_DIR) 
    47  
    48 openwrt-linux.trx.jffs2: 
    49         $(BUILD_DIR)/trx -o openwrt-linux.trx.jffs2 $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).jffs2 
    50  
    51 openwrt-gs-code.bin.jffs2: openwrt-linux.trx.jffs2 
    52         $(BUILD_DIR)/addpattern -2 -i  openwrt-linux.trx.jffs2 -o openwrt-gs-code.bin.jffs2 -g 
    53  
    54 openwrt-g-code.bin.jffs2: openwrt-gs-code.bin.jffs2 
    55         sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.jffs2 > openwrt-g-code.bin.jffs2 
    56  
    57 openwrt-image-jffs2:    openwrt-g-code.bin.jffs2 
    58  
    59  
  • trunk/openwrt/target/squashfs/Config.in

    r213 r243  
    11config BR2_TARGET_ROOTFS_SQUASHFS 
    2         bool "squashfs (ro) root filesystem for the target device" 
     2        bool "squashfs" 
    33        default n 
    44        help 
  • trunk/openwrt/target/squashfs/Makefile.in

    r241 r243  
    11ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS)),y) 
    2 TARGETS+=squashfsroot openwrt-image-squashfs 
     2TARGETS+=squashfsroot 
     3ROOTFS=squashfs 
    34endif 
  • trunk/openwrt/target/squashfs/squashfsroot.mk

    r241 r243  
    4848squashfsroot-dirclean: 
    4949        rm -rf $(SQUASHFS_DIR) 
    50  
    51 openwrt-linux.trx.squashfs: 
    52         $(BUILD_DIR)/trx -o openwrt-linux.trx.squashfs $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).squashfs 
    53  
    54 openwrt-gs-code.bin.squashfs: openwrt-linux.trx.squashfs 
    55         $(BUILD_DIR)/addpattern -2 -i  openwrt-linux.trx.squashfs -o openwrt-gs-code.bin.squashfs -g 
    56  
    57 openwrt-g-code.bin.squashfs: openwrt-gs-code.bin.squashfs 
    58         sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.squashfs > openwrt-g-code.bin.squashfs 
    59  
    60 openwrt-image-squashfs: openwrt-g-code.bin.squashfs 
Note: See TracChangeset for help on using the changeset viewer.