Add zerofree to cleanup flash and xenimages before compressing.

diff --git a/config/rootfiles/common/zerofree b/config/rootfiles/common/zerofree
new file mode 100644 (file)
index 0000000..f9b553d
--- /dev/null
+++ b/config/rootfiles/common/zerofree
@@ -0,0 +1 @@
+#usr/sbin/zerofree

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 5780ff6ca6c2b3eda9d4a5d2a279cf3db7d6d03f..91c833b038447f80de7e5ae1a69f5b422f64f722 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -361,4 +361,5 @@
 * wpa_supplicant-0.6.9
 * xfsprogs-2.9.4
 * xvidcore-1.2.1
+* zerofree-1.0.1
 * zlib-1.2.3

diff --git a/lfs/flash-images b/lfs/flash-images
index db215f20778075b195c694a1e5bba1dd6c370be8..29061409405ba76cbcfe84b816fc34eb0864a63d 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -127,6 +127,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        umount $(MNThdd)/var
        umount $(MNThdd)
 
+       # zerofree the ext3 images to get better compression
+       zerofree $(IMGboot)
+       zerofree $(IMGroot)
+       zerofree $(IMGvar)
+
        # Cat to an image
        cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinst)
        # Write Partition table
@@ -159,6 +164,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        umount $(MNThdd)/boot
        umount $(MNThdd)
 
+       # zerofree the ext3 images to get better compression
+       zerofree $(IMGboot)
+       zerofree $(IMGroot)
+       zerofree $(IMGvar)
+
        # Cat to an image
        cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinsts)
        rm -vf $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar)

diff --git a/lfs/xen-image b/lfs/xen-image
index 63c7b3e46b55e72b75c793e52a29c06dc8c927ba..ffa1681cc6aae2b2acd779075629d23526fa9a1e 100644 (file)
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -188,6 +188,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        umount $(MNThdd)/boot
        umount $(MNThdd)
 
+       # Zerofree ext3 images to get better compression
+       zerofree $(IMGboot)
+       zerofree $(IMGroot)
+       zerofree $(IMGvar)
+
        # Compress Image
        cd /install/images/ && tar -cvjf $(IMGinst) $(SNAME)
 

diff --git a/lfs/zerofree b/lfs/zerofree
new file mode 100644 (file)
index 0000000..7e3dda5
--- /dev/null
+++ b/lfs/zerofree
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.0.1
+
+THISAPP    = zerofree-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = a8c772fdd134448f25ab4e7e12004595
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && install -m 755 zerofree /usr/sbin/
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 047708560eeb280311b4a9165427f4dd8ee4571d..5130077ab8acdbe1a050d0f48bd5299e54ea58c3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -642,6 +642,7 @@ buildipfire() {
   ipfiremake asterisk
   ipfiremake lcr
   ipfiremake usb_modeswitch
+  ipfiremake zerofree
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild