From 35bb4963dfde0ce2a0105d4a7050b0c8f5c76769 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 18 Aug 2014 20:26:35 +0200
Subject: [PATCH] Update kernel configs to 14.07-rc3

---
 include/gluon.mk                        | 2 +-
 targets/ar71xx-generic/kernel-config    | 5 +++--
 targets/ar71xx-generic/kernel-vermagic  | 2 +-
 targets/mpc85xx-generic/kernel-config   | 5 +++--
 targets/mpc85xx-generic/kernel-vermagic | 2 +-
 targets/x86-generic/kernel-config       | 5 +++--
 targets/x86-generic/kernel-vermagic     | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/include/gluon.mk b/include/gluon.mk
index 178c6241c..84da5449b 100644
--- a/include/gluon.mk
+++ b/include/gluon.mk
@@ -28,7 +28,7 @@ export GLUON_VERSION
 ifeq ($(OPENWRT_BUILD),1)
 ifeq ($(GLUON_TOOLS),1)
 
-CONFIG_VERSION_REPO := $(shell $(GLUONDIR)/scripts/site.sh opkg_repo || echo http://downloads.openwrt.org/barrier_breaker/14.07-rc2/%S/packages)
+CONFIG_VERSION_REPO := $(shell $(GLUONDIR)/scripts/site.sh opkg_repo || echo http://downloads.openwrt.org/barrier_breaker/14.07-rc3/%S/packages)
 export CONFIG_VERSION_REPO
 
 GLUON_SITE_CODE := $(shell $(GLUONDIR)/scripts/site.sh site_code)
diff --git a/targets/ar71xx-generic/kernel-config b/targets/ar71xx-generic/kernel-config
index 551d00545..1f5a4c290 100644
--- a/targets/ar71xx-generic/kernel-config
+++ b/targets/ar71xx-generic/kernel-config
@@ -652,8 +652,8 @@ CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 # CONFIG_NETFILTER_XT_TARGET_MARK is not set
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
@@ -684,6 +684,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_ID=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
diff --git a/targets/ar71xx-generic/kernel-vermagic b/targets/ar71xx-generic/kernel-vermagic
index e28ee2ac5..26b1c0c97 100644
--- a/targets/ar71xx-generic/kernel-vermagic
+++ b/targets/ar71xx-generic/kernel-vermagic
@@ -1 +1 @@
-f2469bbdb9dd44754c52e799dc02ee7f
+94831e5bcf361d1c03e87a15e152b0e8
diff --git a/targets/mpc85xx-generic/kernel-config b/targets/mpc85xx-generic/kernel-config
index 86c84db47..1e623dc18 100644
--- a/targets/mpc85xx-generic/kernel-config
+++ b/targets/mpc85xx-generic/kernel-config
@@ -608,8 +608,8 @@ CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 # CONFIG_NETFILTER_XT_TARGET_MARK is not set
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
@@ -640,6 +640,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_ID=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
diff --git a/targets/mpc85xx-generic/kernel-vermagic b/targets/mpc85xx-generic/kernel-vermagic
index 4f718abfa..bf824cec2 100644
--- a/targets/mpc85xx-generic/kernel-vermagic
+++ b/targets/mpc85xx-generic/kernel-vermagic
@@ -1 +1 @@
-9437e5393e90f8b42c3d721625895f7f
+c1a44dd429e530bed2958b8e6cb54a52
diff --git a/targets/x86-generic/kernel-config b/targets/x86-generic/kernel-config
index 1b37d3a84..e81021fab 100644
--- a/targets/x86-generic/kernel-config
+++ b/targets/x86-generic/kernel-config
@@ -727,8 +727,8 @@ CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 # CONFIG_NETFILTER_XT_TARGET_MARK is not set
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
@@ -759,6 +759,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_ID=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
diff --git a/targets/x86-generic/kernel-vermagic b/targets/x86-generic/kernel-vermagic
index a36aaf8f5..f3bb33e2e 100644
--- a/targets/x86-generic/kernel-vermagic
+++ b/targets/x86-generic/kernel-vermagic
@@ -1 +1 @@
-142143844bfcd7ade9ea7e57dd843e69
+3051dee8f07064b727e9d57fbfeb05ec
-- 
GitLab