[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6f9e582fb5e6c8d85f76993e10a5268a20af4a5b - IPFire-SCM

15 Feb 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  6f9e582fb5e6c8d85f76993e10a5268a20af4a5b (commit)
       via  f9f027776cecd9b5d3b3047a81f099eddab6999d (commit)
       via  ec42d1dadffdf903148115623a3684a2cddb7358 (commit)
       via  6a65d1265b8ed48a33a9085fb9770d6aa5fddccf (commit)
      from  e2203453ca40e082dbb4b0d958f7e3c31dd1d0e3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6f9e582fb5e6c8d85f76993e10a5268a20af4a5b
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Mon Feb 15 07:17:43 2010 +0100
Switch kernel/initrd compression to lzma.
commit f9f027776cecd9b5d3b3047a81f099eddab6999d
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Feb 14 18:31:21 2010 +0100
Add xz.
commit ec42d1dadffdf903148115623a3684a2cddb7358
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Feb 14 18:29:59 2010 +0100
Updated squashfstools (4.0).
commit 6a65d1265b8ed48a33a9085fb9770d6aa5fddccf
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Feb 14 18:28:59 2010 +0100
Rootfile update: iptables.
-----------------------------------------------------------------------
Summary of changes:
 config/kernel/kernel.config.i586-ipfire |   10 ++--
 config/rootfiles/common/iptables        |    3 +-
 config/rootfiles/common/xz              |   80 +++++++++++++++++++++++++++++++
 doc/packages-list.txt                   |    5 +-
 lfs/linux                               |    8 ++-
 lfs/squashfstools                       |   10 ++--
 lfs/{libsigc++ => xz}                   |   10 ++--
 make.sh                                 |    1 +
 8 files changed, 109 insertions(+), 18 deletions(-)
 create mode 100644 config/rootfiles/common/xz
 copy lfs/{libsigc++ => xz} (96%)
Difference in files:

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index d777df1..c3a51a0 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.8
-# Sat Feb 13 19:41:01 2010
+# Sun Feb 14 22:42:41 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -69,8 +69,8 @@ CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
 # CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_BZIP2=y
-# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -1085,7 +1085,7 @@ CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=8
-CONFIG_BLK_DEV_RAM_SIZE=32786
+CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_BLK_DEV_XIP is not set
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_ATA_OVER_ETH=m
@@ -3615,6 +3615,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_UBIFS_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_LZMA=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -3946,6 +3947,7 @@ CONFIG_LZO_DECOMPRESS=m
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZMA_NEEDED=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index df4a177..44d1b8d 100644
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -35,7 +35,6 @@ lib/xtables
 #lib/xtables/libipt_CLUSTERIP.so
 #lib/xtables/libipt_DNAT.so
 #lib/xtables/libipt_ECN.so
-#lib/xtables/libipt_IMQ.so
 #lib/xtables/libipt_LOG.so
 #lib/xtables/libipt_MASQUERADE.so
 #lib/xtables/libipt_MIRROR.so
@@ -51,6 +50,7 @@ lib/xtables
 #lib/xtables/libipt_ah.so
 #lib/xtables/libipt_ecn.so
 #lib/xtables/libipt_icmp.so
+#lib/xtables/libipt_ipp2p.so
 #lib/xtables/libipt_realm.so
 #lib/xtables/libipt_set.so
 #lib/xtables/libipt_ttl.so
@@ -59,6 +59,7 @@ lib/xtables
 #lib/xtables/libxt_CONNMARK.so
 #lib/xtables/libxt_CONNSECMARK.so
 #lib/xtables/libxt_DSCP.so
+#lib/xtables/libxt_IMQ.so
 #lib/xtables/libxt_MARK.so
 #lib/xtables/libxt_NFLOG.so
 #lib/xtables/libxt_NFQUEUE.so
diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz
new file mode 100644
index 0000000..ef419c5
--- /dev/null
+++ b/config/rootfiles/common/xz
@@ -0,0 +1,80 @@
+usr/bin/lzcat
+usr/bin/lzcmp
+usr/bin/lzdiff
+usr/bin/lzegrep
+usr/bin/lzfgrep
+usr/bin/lzgrep
+usr/bin/lzless
+usr/bin/lzma
+usr/bin/lzmadec
+usr/bin/lzmainfo
+usr/bin/lzmore
+usr/bin/unlzma
+usr/bin/unxz
+usr/bin/xz
+usr/bin/xzcat
+usr/bin/xzcmp
+usr/bin/xzdec
+usr/bin/xzdiff
+usr/bin/xzegrep
+usr/bin/xzfgrep
+usr/bin/xzgrep
+usr/bin/xzless
+usr/bin/xzmore
+#usr/include/lzma
+#usr/include/lzma.h
+#usr/include/lzma/base.h
+#usr/include/lzma/bcj.h
+#usr/include/lzma/block.h
+#usr/include/lzma/check.h
+#usr/include/lzma/container.h
+#usr/include/lzma/delta.h
+#usr/include/lzma/filter.h
+#usr/include/lzma/index.h
+#usr/include/lzma/index_hash.h
+#usr/include/lzma/lzma.h
+#usr/include/lzma/stream_flags.h
+#usr/include/lzma/subblock.h
+#usr/include/lzma/version.h
+#usr/include/lzma/vli.h
+#usr/lib/liblzma.a
+#usr/lib/liblzma.la
+usr/lib/liblzma.so
+usr/lib/liblzma.so.0
+usr/lib/liblzma.so.0.0.0
+#usr/lib/pkgconfig/liblzma.pc
+#usr/share/doc/xz
+#usr/share/doc/xz/AUTHORS
+#usr/share/doc/xz/COPYING
+#usr/share/doc/xz/COPYING.GPLv2
+#usr/share/doc/xz/NEWS
+#usr/share/doc/xz/README
+#usr/share/doc/xz/THANKS
+#usr/share/doc/xz/TODO
+#usr/share/doc/xz/faq.txt
+#usr/share/doc/xz/history.txt
+#usr/share/doc/xz/lzma-file-format.txt
+#usr/share/doc/xz/xz-file-format.txt
+#usr/share/man/man1/lzcat.1
+#usr/share/man/man1/lzcmp.1
+#usr/share/man/man1/lzdiff.1
+#usr/share/man/man1/lzegrep.1
+#usr/share/man/man1/lzfgrep.1
+#usr/share/man/man1/lzgrep.1
+#usr/share/man/man1/lzless.1
+#usr/share/man/man1/lzma.1
+#usr/share/man/man1/lzmadec.1
+#usr/share/man/man1/lzmainfo.1
+#usr/share/man/man1/lzmore.1
+#usr/share/man/man1/unlzma.1
+#usr/share/man/man1/unxz.1
+#usr/share/man/man1/xz.1
+#usr/share/man/man1/xzcat.1
+#usr/share/man/man1/xzcmp.1
+#usr/share/man/man1/xzdec.1
+#usr/share/man/man1/xzdiff.1
+#usr/share/man/man1/xzegrep.1
+#usr/share/man/man1/xzfgrep.1
+#usr/share/man/man1/xzgrep.1
+#usr/share/man/man1/xzless.1
+#usr/share/man/man1/xzmore.1
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 6b878a8..ed21da5 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -287,7 +287,7 @@
 * spandsp-0.0.6pre12
 * splix-2.0.0-rc2
 * sqlite-3.6.10
-* squashfs3.4
+* squashfs-lzma-cvs20100214
 * squid-2.7.STABLE7
 * squidGuard-1.4.1
 * squidclamav-4.1
@@ -319,7 +319,7 @@
 * usb_modeswitch-1.0.6
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-9defbd461e5f-kmod-2.6.32.8-ipfire
+* v4l-dvb-690055993011-kmod-2.6.32.8-ipfire
 * vdr-1.6.0
 * vdradmin-am-3.6.5
 * vim-7.0
@@ -337,5 +337,6 @@
 * wpa_supplicant-0.6.9
 * xfsprogs-2.9.4
 * xvidcore-1.2.1
+* xz-4.999.9beta
 * zerofree-1.0.1
 * zlib-1.2.3
diff --git a/lfs/linux b/lfs/linux
index 4d3742d..82a5cb4 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -56,20 +56,21 @@ objects =$(DL_FILE) \
    netfilter-layer7-v2.22.tar.gz \
    patch-2.6.16-nath323-1.3.bz2 \
    reiser4-for-2.6.32.patch.bz2 \
+	squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \
 #	linux-$(VER)-suse_xen_patches-1.tar.bz2
$(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.22.tar.gz		= $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
 patch-2.6.16-nath323-1.3.bz2		= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 reiser4-for-2.6.32.patch.bz2		= $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
+squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2
 #linux-$(VER)-suse_xen_patches-1.tar.bz2	= $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
-
 $(DL_FILE)_MD5				= 82023ede52f067fcc55c5e70b02e48ae
-
 netfilter-layer7-v2.22.tar.gz_MD5	= 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
 reiser4-for-2.6.32.patch.bz2_MD5	= 3246397973d9271eb8e6d7c97c5d2d91
+squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4
 #linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = ddbde50f3bc303d947531402017a3055
install : $(TARGET)
@@ -143,6 +144,9 @@ endif
    cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
    cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.22/kernel-2.6.25-2.6.28-layer7-2.22.patch
+	# Squashfs LZMA support
+	cd $(DIR_APP) && bzcat $(DIR_DL)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 | patch -Np1
+
    # Cleanup kernel source
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
diff --git a/lfs/squashfstools b/lfs/squashfstools
index 07143e1..bc1eb65 100644
--- a/lfs/squashfstools
+++ b/lfs/squashfstools
@@ -24,10 +24,10 @@
include Config
-VER        = 3.4
+VER        = cvs20100214
-THISAPP    = squashfs$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = squashfs-lzma-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
+$(DL_FILE)_MD5 = 6bcc0500dd126cb8cafa85f111f8496e
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP)/squashfs-tools && make mksquashfs
    cd $(DIR_APP)/squashfs-tools && cp -f mksquashfs /bin
    @rm -rf $(DIR_APP)
diff --git a/lfs/xz b/lfs/xz
new file mode 100644
index 0000000..4845227
--- /dev/null
+++ b/lfs/xz
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  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        = 4.999.9beta
+
+THISAPP    = xz-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+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 = cc4044fcc073b8bcf3164d1d0df82161
+
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# 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 jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 6b3e2b0..84e6cfd 100755
--- a/make.sh
+++ b/make.sh
@@ -340,6 +340,7 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
+  ipfiremake xz
 #  ipfiremake linux			XEN=1
 #  ipfiremake kqemu			XEN=1
 #  #ipfiremake kvm-kmod			XEN=1
hooks/post-receive
--
IPFire 2.x development tree

    