Switch kernel/initrd compression to lzma.

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index d777df192504caff524d14404f2ff7f8407119d9..c3a51a0ecc6b87af667b12d68975bc46e4fb11f9 100644 (file)
--- 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/doc/packages-list.txt b/doc/packages-list.txt
index 6b878a8cfe3f56cf043b1ab599372fd949318fed..ed21da523ed7ec880978cc501bea6ac41cd578cc 100644 (file)
--- 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 4d3742dea9e8844ca66f87a397011eb4d3263970..82a5cb4a6b519832c348c834ec7223ce5f4e8ad3 100644 (file)
--- 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 b4c5eb375b02f84662bb94db14891c2fc63396c7..bc1eb65d109252010d789d83fe4f3bea176a9e9d 100644 (file)
--- a/lfs/squashfstools
+++ b/lfs/squashfstools
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 4.0
+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 = a3c23391da4ebab0ac4a75021ddabf96
+$(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)