Merge branch 'strongswan-5' into thirteen

[people/teissler/ipfire-2.x.git] / lfs / linux

diff --git a/lfs/linux b/lfs/linux
index d51c6df608c06d0e229c0ee415e15b7968ee0866..b481e65b5536d50e5c8d056f4eaabf6d664bae35 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,9 +24,9 @@
 
 include Config
 
-VER           = 3.2.28
+VER           = 3.2.30
 
-RPI_PATCHES = linux-3.2.27-091073b
+RPI_PATCHES = linux-3.2.27-807223a
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.bz2
@@ -75,8 +75,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                         = d387130f084f48fae7b2d1756f6c9257
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 9daec752fba403a488818df6dd57a714
+$(DL_FILE)_MD5                         = d899e65520424a27661009ea43b28103
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = b072ccb2534ff910fd5867fc0da1b24a
 
 install : $(TARGET)
 
@@ -120,12 +120,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Layer7-patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/netfilter_layer7_2.22_kernel3.0.patch
 
-       # Add some more LED triggers
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch
-
-       # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
-
        # Fix uevent PHYSDEVDRIVER
 #      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
@@ -152,7 +146,6 @@ endif
 ifeq "$(KCFG)" "-rpi"
        # Apply Raspberry Pi kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch
 endif
 
 ifeq "$(HEADERS)" "1"