From 20f8bc7c6e8ed978993bfe7587b15e71a1d06813 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 12 Feb 2005 02:35:19 +0000 Subject: [PATCH] some Makefile cleanup SVN-Revision: 230 --- openwrt/target/squashfs/Makefile.in | 2 +- openwrt/target/squashfs/squashfsroot.mk | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/openwrt/target/squashfs/Makefile.in b/openwrt/target/squashfs/Makefile.in index f78961776a..a5f875af84 100644 --- a/openwrt/target/squashfs/Makefile.in +++ b/openwrt/target/squashfs/Makefile.in @@ -1,3 +1,3 @@ ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS)),y) -TARGETS+=squashfsroot openwrt-code.bin.squashfs +TARGETS+=openwrt-image endif diff --git a/openwrt/target/squashfs/squashfsroot.mk b/openwrt/target/squashfs/squashfsroot.mk index f3d2808592..f97b6419a5 100644 --- a/openwrt/target/squashfs/squashfsroot.mk +++ b/openwrt/target/squashfs/squashfsroot.mk @@ -4,6 +4,8 @@ # ############################################################# +ROOTFSTYPE=squashfs + SQUASHFS_DIR=$(BUILD_DIR)/squashfs2.1-r2 SQUASHFS_SOURCE=squashfs2.1-r2.tar.gz SQUASHFS_SITE=http://dl.sourceforge.net/sourceforge/squashfs @@ -38,7 +40,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).squashfs -noappend -root-owned -le + $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).$(ROOTFSTYPE) -noappend -root-owned -le squashfsroot-source: squashfs-source @@ -48,3 +50,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-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-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-image: openwrt-g-code.bin.$(ROOTFSTYPE) -- 2.25.1