Remove unneeded squashfs patches.

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 9b61031f755348ceff31ec10d4a8b8a7e05119e8..74e427d2096cf5c128760c78c9c7262c39256874 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -37,7 +37,7 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.23
-* alsa-lib-1.0.23-kmod-2.6.32.19-ipfire
+* alsa-lib-1.0.23-kmod-2.6.32.21-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
@@ -67,20 +67,20 @@
 * clamav-0.96.2
 * cmake-2.4.8
 * collectd-4.9.1
-* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire
-* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire-xen
+* compat-wireless-2.6.35-1-kmod-2.6.32.21-ipfire
+* compat-wireless-2.6.35-1-kmod-2.6.32.21-ipfire-xen
 * coreutils-5.96
 * cpio-2.11
 * cpufrequtils-007
-* cryptodev-20091126-kmod-2.6.32.19-ipfire
-* cryptodev-20091126-kmod-2.6.32.19-ipfire-xen
+* cryptodev-20091126-kmod-2.6.32.21-ipfire
+* cryptodev-20091126-kmod-2.6.32.21-ipfire-xen
 * cups-1.4.2
 * curl-7.19.5
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * dahdi-2.2.1
-* dahdi-2.2.1-kmod-2.6.32.19-ipfire
-* dahdi-2.2.1-kmod-2.6.32.19-ipfire-xen
+* dahdi-2.2.1-kmod-2.6.32.21-ipfire
+* dahdi-2.2.1-kmod-2.6.32.21-ipfire-xen
 * db-4.4.20
 * dbus-1.0.3
 * ddrescue-1.12
@@ -90,10 +90,10 @@
 * dnsmasq-2.45
 * dosfstools-3.0.9
 * dracut-006
-* e1000-8.0.19-kmod-2.6.32.19-ipfire
-* e1000-8.0.19-kmod-2.6.32.19-ipfire-xen
-* e1000e-1.1.19-kmod-2.6.32.19-ipfire
-* e1000e-1.1.19-kmod-2.6.32.19-ipfire-xen
+* e1000-8.0.19-kmod-2.6.32.21-ipfire
+* e1000-8.0.19-kmod-2.6.32.21-ipfire-xen
+* e1000e-1.1.19-kmod-2.6.32.21-ipfire
+* e1000e-1.1.19-kmod-2.6.32.21-ipfire-xen
 * e2fsprogs-1.41.11
 * ebtables-v2.0.8-2
 * ed-0.2
@@ -148,8 +148,8 @@
 * icecream-0.9.4.8
 * icegenerator-0.5.5-pre2
 * iftop-0.17
-* igb-2.3.4-kmod-2.6.32.15-ipfire
-* igb-2.3.4-kmod-2.6.32.15-ipfire-xen
+* igb-2.3.4-kmod-2.6.32.21-ipfire
+* igb-2.3.4-kmod-2.6.32.21-ipfire-xen
 * igmpproxy-0.1
 * imspector-0.9
 * inetutils-1.4.2
@@ -165,8 +165,8 @@
 * joe-3.7
 * jpegsrc.v6b
 * kbd-1.12
-* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.32.21-ipfire
+* kqemu-1.4.0pre1-kmod-2.6.32.21-ipfire-xen
 * kudzu-1.2.64
 * l7-protocols-2009-05-10
 * lame-3.97
@@ -200,8 +200,8 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.32.19-ipfire
-* linux-2.6.32.19-ipfire-xen
+* linux-2.6.32.21-ipfire
+* linux-2.6.32.21-ipfire-xen
 * linux-atm-2.4.1
 * linux-firmware-20100318
 * linux-libc-headers-2.6.12.0
@@ -212,11 +212,11 @@
 * lynis-1.2.9
 * lzo-2.02
 * m4-1.4.4
-* mISDN-20100525-kmod-2.6.32.19-ipfire
-* mISDN-20100525-kmod-2.6.32.19-ipfire-xen
+* mISDN-20100525-kmod-2.6.32.21-ipfire
+* mISDN-20100525-kmod-2.6.32.21-ipfire-xen
 * mISDNuser-20100525
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire-xen
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.21-ipfire
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.21-ipfire-xen
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -285,12 +285,12 @@
 * psmisc-22.2
 * qemu-0.11.1-kqemu
 * qemu-0.12.3
-* r8101-1.016.00-kmod-2.6.32.19-ipfire
-* r8101-1.016.00-kmod-2.6.32.19-ipfire-xen
-* r8168-8.018.00-kmod-2.6.32.19-ipfire
-* r8168-8.018.00-kmod-2.6.32.19-ipfire-xen
-* r8169-6.013.00-kmod-2.6.32.19-ipfire
-* r8169-6.013.00-kmod-2.6.32.19-ipfire-xen
+* r8101-1.016.00-kmod-2.6.32.21-ipfire
+* r8101-1.016.00-kmod-2.6.32.21-ipfire-xen
+* r8168-8.018.00-kmod-2.6.32.21-ipfire
+* r8168-8.018.00-kmod-2.6.32.21-ipfire-xen
+* r8169-6.013.00-kmod-2.6.32.21-ipfire
+* r8169-6.013.00-kmod-2.6.32.21-ipfire-xen
 * readline-5.1
 * reiser4progs-1.0.6
 * reiserfsprogs-3.6.21
@@ -313,7 +313,6 @@
 * spandsp-0.0.6pre12
 * splix-2.0.0-rc2
 * sqlite-3.6.10
-* squashfs-lzma-cvs20100214
 * squid-2.7.STABLE9
 * squidGuard-1.4.1
 * squidclamav-5.4
@@ -346,8 +345,8 @@
 * usb-modeswitch-data-20100707
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire
-* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire-xen
+* v4l-dvb-b576509ea6d2-kmod-2.6.32.21-ipfire
+* v4l-dvb-b576509ea6d2-kmod-2.6.32.21-ipfire-xen
 * vdr-1.6.0
 * vdradmin-am-3.6.7
 * vim-7.0

diff --git a/lfs/linux b/lfs/linux
index 3816ef329453eefd5387d9d0b8792a85869e4401..7a35feb3651d64dc6ce2433cd91332f19911e166 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -56,21 +56,18 @@ 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 \
        xen-patches-2.6.32-2c.tar.bz2
 
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.22.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.22.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
 xen-patches-2.6.32-2c.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2
 
 $(DL_FILE)_MD5                         = e4acefa00c5b8fcc539d9cbf34d88cdb
 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
 xen-patches-2.6.32-2c.tar.bz2_MD5      = 62a75ddcba43894b20f754a94b299ce6
 
 install : $(TARGET)
@@ -138,9 +135,6 @@ 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
-
        # Add some more LED triggers
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch