cleanup the whole addpattern / trx nonsense
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@243 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
f18e19f82f
commit
bee1606589
|
@ -99,7 +99,7 @@ openwrt-mtd: $(TARGET_DIR)/$(OPENWRT_MTD_TARGET_BINARY)
|
|||
|
||||
# trx tool
|
||||
OPENWRT_TRX_SOURCE=package/openwrt/trx.c
|
||||
OPENWRT_TRX_TARGET=$(BUILD_DIR)/trx
|
||||
OPENWRT_TRX_TARGET=$(STAGING_DIR)/bin/trx
|
||||
|
||||
$(OPENWRT_TRX_TARGET):
|
||||
$(CC) -o $(OPENWRT_TRX_TARGET) $(OPENWRT_TRX_SOURCE)
|
||||
|
@ -108,7 +108,7 @@ openwrt-trx: $(OPENWRT_TRX_TARGET)
|
|||
|
||||
# addpattern tool
|
||||
OPENWRT_ADDPATTERN_SOURCE=package/openwrt/addpattern.c
|
||||
OPENWRT_ADDPATTERN_TARGET=$(BUILD_DIR)/addpattern
|
||||
OPENWRT_ADDPATTERN_TARGET=$(STAGING_DIR)/bin/addpattern
|
||||
|
||||
$(OPENWRT_ADDPATTERN_TARGET):
|
||||
$(CC) -o $(OPENWRT_ADDPATTERN_TARGET) $(OPENWRT_ADDPATTERN_SOURCE)
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
#
|
||||
|
||||
menu "Target Filesystem"
|
||||
|
||||
source "target/jffs2/Config.in"
|
||||
source "target/squashfs/Config.in"
|
||||
|
||||
endmenu
|
||||
|
||||
choice
|
||||
prompt "Target Root Filesystem"
|
||||
source "target/jffs2/Config.in"
|
||||
source "target/squashfs/Config.in"
|
||||
endchoice
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
config BR2_TARGET_ROOTFS_JFFS2
|
||||
bool "jffs2 root filesystem for the target device"
|
||||
bool "jffs2"
|
||||
default n
|
||||
help
|
||||
Build a jffs2 root filesystem
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
|
||||
TARGETS+=jffs2root openwrt-image-jffs2
|
||||
ROOTFS=jffs2
|
||||
endif
|
||||
|
|
|
@ -44,16 +44,3 @@ jffs2root-clean:
|
|||
|
||||
jffs2root-dirclean:
|
||||
rm -rf $(MTD_DIR)
|
||||
|
||||
openwrt-linux.trx.jffs2:
|
||||
$(BUILD_DIR)/trx -o openwrt-linux.trx.jffs2 $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).jffs2
|
||||
|
||||
openwrt-gs-code.bin.jffs2: openwrt-linux.trx.jffs2
|
||||
$(BUILD_DIR)/addpattern -2 -i openwrt-linux.trx.jffs2 -o openwrt-gs-code.bin.jffs2 -g
|
||||
|
||||
openwrt-g-code.bin.jffs2: openwrt-gs-code.bin.jffs2
|
||||
sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.jffs2 > openwrt-g-code.bin.jffs2
|
||||
|
||||
openwrt-image-jffs2: openwrt-g-code.bin.jffs2
|
||||
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
config BR2_TARGET_ROOTFS_SQUASHFS
|
||||
bool "squashfs (ro) root filesystem for the target device"
|
||||
bool "squashfs"
|
||||
default n
|
||||
help
|
||||
Build a squashfs root filesystem
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS)),y)
|
||||
TARGETS+=squashfsroot openwrt-image-squashfs
|
||||
TARGETS+=squashfsroot
|
||||
ROOTFS=squashfs
|
||||
endif
|
||||
|
|
|
@ -47,14 +47,3 @@ squashfsroot-clean:
|
|||
|
||||
squashfsroot-dirclean:
|
||||
rm -rf $(SQUASHFS_DIR)
|
||||
|
||||
openwrt-linux.trx.squashfs:
|
||||
$(BUILD_DIR)/trx -o openwrt-linux.trx.squashfs $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).squashfs
|
||||
|
||||
openwrt-gs-code.bin.squashfs: openwrt-linux.trx.squashfs
|
||||
$(BUILD_DIR)/addpattern -2 -i openwrt-linux.trx.squashfs -o openwrt-gs-code.bin.squashfs -g
|
||||
|
||||
openwrt-g-code.bin.squashfs: openwrt-gs-code.bin.squashfs
|
||||
sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.squashfs > openwrt-g-code.bin.squashfs
|
||||
|
||||
openwrt-image-squashfs: openwrt-g-code.bin.squashfs
|
||||
|
|
Loading…
Reference in New Issue