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

[openwrt-10.03/.git] / openwrt / target / Makefile.in

diff --git a/openwrt/target/Makefile.in b/openwrt/target/Makefile.in
index 7a212e489f82ba07840acb603df7b84a53fa7901..aeceb3c149c983d3368e715daac9a134ab4df2c1 100644 (file)
--- a/openwrt/target/Makefile.in
+++ b/openwrt/target/Makefile.in
@@ -1,25 +1,30 @@
 # Default target skeleton stuff, may be overridden
-DIST=openwrt
+EXTRAVERSION:=
+XXX:=
 TARGET_SKELETON=target/default/skel.tar.gz
 TARGET_SKEL_DIR=target/default/target_skeleton
 
 include target/device/Makefile.in
 
 ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-JFFS2FLAGS+=-a 131072
+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 \
+        $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS)
 
-$(DIST)-linux.trx: openwrt-trx
-       PATH=$(TARGET_PATH) trx -o $(DIST)-linux.trx $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS)
+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
 
-$(DIST)-gs-code.bin: openwrt-addpattern $(DIST)-linux.trx
-       PATH=$(TARGET_PATH) addpattern -2 -i  $(DIST)-linux.trx -o $(DIST)-gs-code.bin -g
-
-$(DIST)-g-code.bin: $(DIST)-gs-code.bin
-       sed -e "1s,^W54S,W54G," < $(DIST)-gs-code.bin > $(DIST)-g-code.bin
+ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
+else
+endif
 
-openwrt-image: openwrt $(DIST)-g-code.bin
+openwrt-image-clean: 
+       @-rm openwrt-* 2>/dev/null
 
-$(DIST)-image-clean:
-       @-rm $(DIST)-* 2>/dev/null
+openwrt-image-dirclean: openwrt-dirclean