]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - lfs/linux
Merge remote-tracking branch 'origin/next' into thirteen
[ipfire-2.x.git] / lfs / linux
index 31c585f6681bae6f1f69ef96d17b931947b3d738..e7f48b637a6bae2f3b079d534c939691514b51cf 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,9 +24,9 @@
 
 include Config
 
-VER           = 3.2.29
+VER           = 3.2.32
 
-RPI_PATCHES = linux-3.2.27-091073b
+RPI_PATCHES = linux-3.2.27-9245b4c
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.bz2
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 20
+PAK_VER    = 21
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -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                         = 89c76e7849e6dc8288d297e1d6f03e81
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 9daec752fba403a488818df6dd57a714
+$(DL_FILE)_MD5                         = d2a4562d8c451e5ec43547e0d8babe57
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = c20baa8dc2527ce89a302862c3fc7f58
 
 install : $(TARGET)
 
@@ -146,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"