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 46bb115ec170624f75d49402411733f577ed3d4c..71a3688877aa9c58b3f4350b02afa2cbf5d7270f 100644 (file)
--- 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 c1e81529adb371da669038a201a4561db99cf23c..bfd84fd276b09b5788d4d839cae47e88d9cc0821 100755 (executable)
--- 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