From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 9 Apr 2009 08:55:20 +0000 (+0200)
Subject: Renamed squashfs to squashfs-tools. Update to 4.0.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb9bb118d0ba98fa5ba592d1d5184bea161a3081;p=ipfire-3.x.git

Renamed squashfs to squashfs-tools. Update to 4.0.
---

diff --git a/lfs/squashfs b/lfs/squashfs-tools
similarity index 91%
rename from lfs/squashfs
rename to lfs/squashfs-tools
index 46bb115ec..71a368887 100644
--- a/lfs/squashfs
+++ b/lfs/squashfs-tools
@@ -25,11 +25,11 @@
 include Config
 
 PKG_NAME   = squashfs-tools
-PKG_VER    = 4.0-CVS-20090404
+PKG_VER    = 4.0
 
 THISAPP    = $(PKG_NAME)-$(PKG_VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DIR_APP    = $(DIR_SRC)/$(PKG_NAME)
+DL_FILE    = squashfs$(PKG_VER).tar.gz
+DIR_APP    = $(DIR_SRC)/squashfs$(PKG_VER)/$(PKG_NAME)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
@@ -52,7 +52,8 @@ $(objects) :
 
 $(OBJECT) : 
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && sed -e "s/^CFLAGS := /& $(CFLAGS) /" -i Makefile
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && install -m 755 mksquashfs /usr/sbin
 	cd $(DIR_APP) && install -m 755 unsquashfs /usr/sbin
diff --git a/make.sh b/make.sh
index c1e81529a..bfd84fd27 100755
--- a/make.sh
+++ b/make.sh
@@ -291,7 +291,7 @@ ipfire_build() {
 	ipfire_make reiser4progs
 	ipfire_make xfsprogs
 	ipfire_make sysfsutils
-	ipfire_make squashfs
+	ipfire_make squashfs-tools
 	ipfire_make dosfstools
 	ipfire_make lvm2
 	ipfire_make mdadm
diff --git a/src/rootfiles/core/squashfs b/src/rootfiles/core/squashfs-tools
similarity index 100%
rename from src/rootfiles/core/squashfs
rename to src/rootfiles/core/squashfs-tools