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

This commit is contained in:
Arne Fitzenreiter
2014-05-21 22:47:13 +02:00
13 changed files with 761 additions and 47 deletions

View File

@@ -24,10 +24,10 @@
include Config
VER = 3.10.39
VER = 3.10.40
RPI_PATCHES = linux-3.10.38-grsec-1b49b45
GRS_PATCHES = grsecurity-2.9.1-3.10.39-ipfire1.patch.xz
GRS_PATCHES = grsecurity-2.9.1-3.10.40-ipfire1.patch.xz
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
PAK_VER = 44
PAK_VER = 45
DEPS = ""
VERSUFIX=ipfire$(KCFG)
@@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
$(DL_FILE)_MD5 = 74db7cc558a1a72ebf5044d286e2bc47
$(DL_FILE)_MD5 = c1dca08f0f1a60f29b7caa9ff45582a8
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff
$(GRS_PATCHES)_MD5 = 6296b7ec4146544249075249e338ceb3
$(GRS_PATCHES)_MD5 = f46506dd67e459fc41d60d0641323668
install : $(TARGET)
@@ -120,6 +120,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Layer7-patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-layer7-filter.patch
# pie packet scheduler
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-pie_packet_sch.patch
# Grsecurity-patches
ifneq "$(KCFG)" "-headers"
cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1