Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next

This commit is contained in:
Michael Tremer
2014-03-26 23:42:57 +01:00
10 changed files with 386 additions and 302 deletions

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
PAK_VER = 28
PAK_VER = 29
DEPS = ""

View File

@@ -24,10 +24,10 @@
include Config
VER = 3.10.33
VER = 3.10.34
RPI_PATCHES = linux-3.10.27-grsec-943b563
GRS_PATCHES = grsecurity-2.9.1-3.10.33-ipfire1.patch.xz
GRS_PATCHES = grsecurity-2.9.1-3.10.34-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 = 38
PAK_VER = 39
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 = 01865f9c129f3c7eee51e25b3781a364
$(DL_FILE)_MD5 = 30991b495a3d75196d5608072d2e62e6
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 8cf81f48408306d93ccee59b58af2e92
$(GRS_PATCHES)_MD5 = c99be0018e8bc55fb2e2b8f0ea9783d5
$(GRS_PATCHES)_MD5 = b490f7f3bf48387ab2eb60212fcf0c11
install : $(TARGET)
@@ -136,6 +136,7 @@ endif
# Wlan Patches
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch
# mISDN Patches
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch