summaryrefslogtreecommitdiffstats
path: root/openwrt/target/Makefile.in
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-04 04:35:15 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-04 04:35:15 +0000
commit22ba317f5174d231be82f368381216404d4032f3 (patch)
treed4618308936a52dfca2e304bfba37bba9b4ca5ec /openwrt/target/Makefile.in
parentdaa2296312f30c1ada9d4c394a785cde8b1fd725 (diff)
fix the jffs2 build for separate 4M/8M images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@303 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/target/Makefile.in')
-rw-r--r--openwrt/target/Makefile.in20
1 files changed, 10 insertions, 10 deletions
diff --git a/openwrt/target/Makefile.in b/openwrt/target/Makefile.in
index 22cd7a420..aeceb3c14 100644
--- a/openwrt/target/Makefile.in
+++ b/openwrt/target/Makefile.in
@@ -1,5 +1,6 @@
# Default target skeleton stuff, may be overridden
-EXTRAVERSION=
+EXTRAVERSION:=
+XXX:=
TARGET_SKELETON=target/default/skel.tar.gz
TARGET_SKEL_DIR=target/default/target_skeleton
@@ -10,19 +11,18 @@ include target/jffs2/blocksize.mk
JFFS2FLAGS+=-a $(JFFS2_BLOCK_SIZE)
endif
-
openwrt-linux.trx: openwrt-trx
- PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \
+ @PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \
$(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS)
-openwrt-gs-code.bin: openwrt-addpattern openwrt-linux.trx
- PATH=$(TARGET_PATH) addpattern -2 -i openwrt-linux$(EXTRAVERSION).trx \
- -o openwrt-gs-code$(EXTRAVERSION).bin -g
-
-openwrt-g-code.bin: openwrt-gs-code.bin
- sed -e "1s,^W54S,W54G," < openwrt-gs-code$(EXTRAVERSION).bin > openwrt-g-code$(EXTRAVERSION).bin
+openwrt-code.bin: openwrt-addpattern openwrt-linux.trx
+ @PATH=$(TARGET_PATH) addpattern -2 -i openwrt-linux$(EXTRAVERSION).trx \
+ -o openwrt-$(TAG)-code$(EXTRAVERSION).bin -g
+ @sed -i -e "1s,^W54S,$(TAG)," openwrt-$(TAG)-code$(EXTRAVERSION).bin
-openwrt-image: openwrt openwrt-g-code.bin
+ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
+else
+endif
openwrt-image-clean:
@-rm openwrt-* 2>/dev/null