aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--config9
-rw-r--r--config.x86_649
4 files changed, 20 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 607971bd28f2..ce791a5c65a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-linode
pkgdesc = Kernel for Linode servers
pkgver = 3.12.4
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/yardenac/linux-linode
install = install
arch = i686
@@ -31,8 +31,8 @@ pkgbase = linux-linode
source = change-default-console-loglevel.patch
md5sums = cc6ee608854e0da4b64f6c1ff8b6398c
md5sums = 511b5a2f0de55b5e91fd293766ce182b
- md5sums = fcbb83b1735e99c7b2f3530d90ffb717
- md5sums = 3054d8a91d7d0eb1780bbfdfaba18f95
+ md5sums = fa53b0860682700d6a4fdc84d175bb4b
+ md5sums = b87938534c40bbf24af636a08c76860e
md5sums = 01afd0c0ff8fcf3fe6e0cd91d12886bd
md5sums = 3d6427cc412dbc226b5d058c82ba7c66
md5sums = 98beb36f9b8cf16e58de2483ea9985e3
diff --git a/PKGBUILD b/PKGBUILD
index bfd3e6c92000..ceece17b9e67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _basekernel=3.12
_kernelname=${pkgname#linux}
_srcname=linux-${_basekernel}
pkgver=${_basekernel}.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="https://github.com/yardenac/linux-linode"
license=(GPL2)
@@ -18,8 +18,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'change-default-console-loglevel.patch')
md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
'511b5a2f0de55b5e91fd293766ce182b'
- 'fcbb83b1735e99c7b2f3530d90ffb717'
- '3054d8a91d7d0eb1780bbfdfaba18f95'
+ 'fa53b0860682700d6a4fdc84d175bb4b'
+ 'b87938534c40bbf24af636a08c76860e'
'01afd0c0ff8fcf3fe6e0cd91d12886bd'
'3d6427cc412dbc226b5d058c82ba7c66'
'98beb36f9b8cf16e58de2483ea9985e3')
diff --git a/config b/config
index 52f9381acdec..96f53726c9e4 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.1-1 Kernel Configuration
+# Linux/x86 3.12.4-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -578,6 +578,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
#
# Core Netfilter Configuration
@@ -685,6 +686,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=y
CONFIG_NETFILTER_XT_MATCH_OWNER=y
CONFIG_NETFILTER_XT_MATCH_POLICY=y
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
CONFIG_NETFILTER_XT_MATCH_RATEEST=y
@@ -769,6 +771,7 @@ CONFIG_IP6_NF_SECURITY=y
CONFIG_NF_NAT_IPV6=y
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_IP_DCCP is not set
CONFIG_IP_SCTP=m
# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -781,7 +784,9 @@ CONFIG_SCTP_COOKIE_HMAC_SHA1=y
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_HAVE_NET_DSA=y
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
diff --git a/config.x86_64 b/config.x86_64
index 5166953a1142..62d8db935461 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.1-1 Kernel Configuration
+# Linux/x86 3.12.4-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -571,6 +571,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
#
# Core Netfilter Configuration
@@ -678,6 +679,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=y
CONFIG_NETFILTER_XT_MATCH_OWNER=y
CONFIG_NETFILTER_XT_MATCH_POLICY=y
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
CONFIG_NETFILTER_XT_MATCH_RATEEST=y
@@ -762,6 +764,7 @@ CONFIG_IP6_NF_SECURITY=y
CONFIG_NF_NAT_IPV6=y
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_IP_DCCP is not set
CONFIG_IP_SCTP=m
# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -774,7 +777,9 @@ CONFIG_SCTP_COOKIE_HMAC_SHA1=y
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_HAVE_NET_DSA=y
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set