aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openwrt.org>2005-02-12 03:46:10 +0000
committerWaldemar Brodkorb <wbx@openwrt.org>2005-02-12 03:46:10 +0000
commit0d224afe6bea3c7bfefdaa4a7f6c4aaf686d79ed (patch)
tree8c2210652ae3d97c4ce779f1bf358fafbab3de19 /target
parentee10c02ac5f752c4d107ffb0b327004770e6b2a3 (diff)
downloadupstream-0d224afe6bea3c7bfefdaa4a7f6c4aaf686d79ed.tar.gz
upstream-0d224afe6bea3c7bfefdaa4a7f6c4aaf686d79ed.tar.bz2
upstream-0d224afe6bea3c7bfefdaa4a7f6c4aaf686d79ed.zip
i am to lame for make, both targets can be build again
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@240 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/jffs2/Makefile.in2
-rw-r--r--target/jffs2/jffs2root.mk13
-rw-r--r--target/squashfs/squashfsroot.mk18
3 files changed, 20 insertions, 13 deletions
diff --git a/target/jffs2/Makefile.in b/target/jffs2/Makefile.in
index 31452eba8d..0db315cc2e 100644
--- a/target/jffs2/Makefile.in
+++ b/target/jffs2/Makefile.in
@@ -1,3 +1,3 @@
ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-TARGETS+=jffs2root
+TARGETS+=jffs2root openwrt-image
endif
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 5dd79032fd..a6e0855521 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -35,8 +35,7 @@ jffs2root: mtd
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/info
$(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
- -D target/default/device_table.txt -d $(TARGET_DIR) \
- -o $(IMAGE).jffs2
+ -d $(TARGET_DIR) -o $(IMAGE).jffs2
jffs2root-source: $(DL_DIR)/$(MTD_SOURCE)
@@ -46,5 +45,15 @@ 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: openwrt-g-code.bin.jffs2
diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index f97b6419a5..3fe1212342 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -4,8 +4,6 @@
#
#############################################################
-ROOTFSTYPE=squashfs
-
SQUASHFS_DIR=$(BUILD_DIR)/squashfs2.1-r2
SQUASHFS_SOURCE=squashfs2.1-r2.tar.gz
SQUASHFS_SITE=http://dl.sourceforge.net/sourceforge/squashfs
@@ -40,7 +38,7 @@ squashfs-dirclean:
squashfsroot: squashfs
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/info
- $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).$(ROOTFSTYPE) -noappend -root-owned -le
+ $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).squashfs -noappend -root-owned -le
squashfsroot-source: squashfs-source
@@ -50,13 +48,13 @@ squashfsroot-clean:
squashfsroot-dirclean:
rm -rf $(SQUASHFS_DIR)
-openwrt-linux.trx.$(ROOTFSTYPE):
- $(BUILD_DIR)/trx -o openwrt-linux.trx.$(ROOTFSTYPE) $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).$(ROOTFSTYPE)
+openwrt-linux.trx.squashfs:
+ $(BUILD_DIR)/trx -o openwrt-linux.trx.squashfs $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).squashfs
-openwrt-gs-code.bin.$(ROOTFSTYPE): openwrt-linux.trx.$(ROOTFSTYPE)
- $(BUILD_DIR)/addpattern -2 -i openwrt-linux.trx.$(ROOTFSTYPE) -o openwrt-gs-code.bin.$(ROOTFSTYPE) -g
+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.$(ROOTFSTYPE): openwrt-gs-code.bin.$(ROOTFSTYPE)
- sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.$(ROOTFSTYPE) > openwrt-g-code.bin.$(ROOTFSTYPE)
+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: openwrt-g-code.bin.$(ROOTFSTYPE)
+openwrt-image: openwrt-g-code.bin.squashfs