Merge remote-tracking branch 'origin/next' into thirteen

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

diff --git a/lfs/linux b/lfs/linux
index 5b26651e73d3e787b1f781fe365b05ffc8b627bc..80050ccfc73d733e20a088366fd63223e3f7dab9 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER           = 3.2.30
+VER           = 3.2.33
 
 RPI_PATCHES = linux-3.2.27-9245b4c
 
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 21
+PAK_VER    = 22
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -75,7 +75,7 @@ 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                         = d899e65520424a27661009ea43b28103
+$(DL_FILE)_MD5                         = 486521c7b00a92fc99e122b84ae9f089
 rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = c20baa8dc2527ce89a302862c3fc7f58
 
 install : $(TARGET)
@@ -120,8 +120,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Layer7-patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/netfilter_layer7_2.22_kernel3.0.patch
 
+       # Add LED trigger
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33-ledtrig-netdev-1.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-3.2.33_ipg-fix-driver-name.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
 ifeq "$(KCFG)" "-kirkwood"
@@ -183,12 +186,12 @@ ifeq "$(KCFG)" "-rpi"
 else
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+       ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
 endif
 endif
 endif
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
-       ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
        ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX)
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install