webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

kernel: update to 3.14.54

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2015-10-21 18:48:32 +02:00
parent 4e8949e817
commit 52daacc5c4
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lfs/linux
View File

@@ -24,10 +24,10 @@
include Config include Config
VER = 3.14.53 VER = 3.14.54
RPI_PATCHES = 3.14.53-grsec-ipfire1 RPI_PATCHES = 3.14.54-grsec-ipfire1
A7M_PATCHES = 3.14.53-grsec-ipfire1 A7M_PATCHES = 3.14.54-grsec-ipfire1
GRS_PATCHES = grsecurity-3.1ipfire-3.14.53-v1.patch.xz GRS_PATCHES = grsecurity-3.1ipfire-3.14.54-v1.patch.xz
THISAPP = linux-$(VER) THISAPP = linux-$(VER)
@@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
$(DL_FILE)_MD5 = 5c5d18ddcc80b008826c2f43b322a34a $(DL_FILE)_MD5 = 61a0568abd96bef9b682d0d46977fbdd
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = de5350ee7c3e4aa82289916963796fd9 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = db92bc85979895efdc6d9da2877ce0ae
arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 25fc733bb657a84eea338104f88bcf70 arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 9092711bcac325c5d0dac5eed98f1c5d
$(GRS_PATCHES)_MD5 = 4c1f6e73f04bfc92b105afff24d0308c $(GRS_PATCHES)_MD5 = 0c1e505cf87177bfb7d62c95e67f10ef
install : $(TARGET) install : $(TARGET)
@@ -134,6 +134,9 @@ ifneq "$(KCFG)" "-headers"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
endif endif
# Fix ip route list hang introduced with linux 3.14.54
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.54_fix_ip_route_list.patch
# DVB Patches # DVB Patches
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-dvbsky.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-dvbsky.patch
cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch

12
src/patches/linux-3.14.54_fix_ip_route_list.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur a/net/core/fib_rules.c b/net/core/fib_rules.c
--- a/net/core/fib_rules.c 2015-10-19 16:40:32.000000000 +0200
+++ b/net/core/fib_rules.c 2015-10-19 16:54:37.836777983 +0200
@@ -631,7 +631,7 @@
err = fib_nl_fill_rule(skb, rule, NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq, RTM_NEWRULE,
NLM_F_MULTI, ops);
- if (err)
+ if (err < 0)
break;
skip:
idx++;