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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@303 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 26 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index bc69f2a1de..ae8e59fbea 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,7 @@ TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 
 world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
+	@echo DONE.
 
 .PHONY: all world clean dirclean distclean source $(TARGETS) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
diff --git a/target/Makefile.in b/target/Makefile.in
index 22cd7a4208..aeceb3c149 100644
--- a/target/Makefile.in
+++ b/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
diff --git a/target/jffs2/blocksize.mk b/target/jffs2/blocksize.mk
deleted file mode 100644
index 9e08a04974..0000000000
--- a/target/jffs2/blocksize.mk
+++ /dev/null
@@ -1 +0,0 @@
-JFFS2_BLOCK_SIZE:=0x20000
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 9846d001f0..b14f2d0f76 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -4,8 +4,6 @@
 #
 #############################################################
 
-include target/jffs2/blocksize.mk
-
 MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig
 MTD_SOURCE=mtd_20050122.orig.tar.gz
 MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd
@@ -46,6 +44,12 @@ jffs2root-dirclean:
 	rm -rf $(MTD_DIR)
 
 ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-TARGETS+=jffs2root openwrt-image
+TARGETS+=openwrt-image
 ROOTFS=jffs2
+
+openwrt-image:	openwrt
+	@make jffs2root openwrt-code.bin TAG=W54G \
+	EXTRAVERSION=$(EXTRAVERSION)-JFFS2-4M JFFS2_BLOCK_SIZE=0x10000
+	@make jffs2root openwrt-code.bin TAG=W54S \
+	EXTRAVERSION=$(EXTRAVERSION)-JFFS2-8M JFFS2_BLOCK_SIZE=0x20000
 endif
diff --git a/target/squashfs-lzma/squashfslzmaroot.mk b/target/squashfs-lzma/squashfslzmaroot.mk
index 722c20524e..1aa80e0029 100644
--- a/target/squashfs-lzma/squashfslzmaroot.mk
+++ b/target/squashfs-lzma/squashfslzmaroot.mk
@@ -39,7 +39,8 @@ squashfslzma-dirclean:
 squashfslzmaroot: squashfslzma
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/info
-	$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le
+	$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma \
+	$(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le
 
 squashfslzmaroot-source: squashfslzma-source
 
@@ -52,4 +53,10 @@ squashfslzmaroot-dirclean:
 ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS_LZMA)),y)
 TARGETS+=squashfslzmaroot openwrt-image
 ROOTFS=squashfslzma
+
+openwrt-image:  openwrt
+	@make openwrt-code.bin TAG=W54G \
+	EXTRAVERSION=$(EXTRAVERSION)-SQUASHFSLZMA
+	@make openwrt-code.bin TAG=W54S \
+	EXTRAVERSION=$(EXTRAVERSION)-SQUASHFSLZMA
 endif