Merge remote-tracking branch 'ummeegge/iptraf-ng' into next

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

diff --git a/lfs/linux b/lfs/linux
index 80050ccfc73d733e20a088366fd63223e3f7dab9..094f09e6455ede9742fc993e24a33d9eff44b088 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2013  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,32 +24,28 @@
 
 include Config
 
-VER           = 3.2.33
+VER        = 3.2.48
 
-RPI_PATCHES = linux-3.2.27-9245b4c
+RPI_PATCHES = linux-3.2.27-ada8b44
 
 THISAPP    = linux-$(VER)
-DL_FILE    = linux-$(VER).tar.bz2
+DL_FILE    = linux-$(VER).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 22
+PAK_VER    = 30
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
 
-ifeq "$(HEADERS)" "1"
 ifeq "$(TOOLS)" "1"
-       TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)-tools
+       TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)-tools
        HEADERS_PREFIX = /tools
-else
-       TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)
-       HEADERS_PREFIX = /usr
-endif
 else
        TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
+       HEADERS_PREFIX = /usr
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -75,8 +71,9 @@ 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                         = 486521c7b00a92fc99e122b84ae9f089
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = c20baa8dc2527ce89a302862c3fc7f58
+$(DL_FILE)_MD5                         = f560aa5fcf07e57ea0ca66fdfdb53ef1
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 966687ff27e450e04ff50e0da829dc00
+
 
 install : $(TARGET)
 
@@ -151,7 +148,7 @@ ifeq "$(KCFG)" "-rpi"
        cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
 endif
 
-ifeq "$(HEADERS)" "1"
+ifeq "$(KCFG)" "-headers"
        # Install the header files
        cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install
        -mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include