aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-07-02 18:03:56 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2016-07-02 18:35:58 +0200
commit1d15a96b29dcd0947690951a7c36aead79a27129 (patch)
tree903b13819244e0c930b19e085e293afb23af6ed4
parent2a8bb4629442dcc55ad68d1dfcdf401c74804b4c (diff)
downloadupstream-1d15a96b29dcd0947690951a7c36aead79a27129.tar.gz
upstream-1d15a96b29dcd0947690951a7c36aead79a27129.tar.bz2
upstream-1d15a96b29dcd0947690951a7c36aead79a27129.zip
kernel: fix build of kmod-udptunnel4 and kmod-udptunnel6
The kernel config option CONFIG_NET_UDP_TUNNEL is not visible and can not directly be activated. When kmod-udptunnel4 or kmod-udptunnel6 are build these packages could be empty when no other kernel module selects CONFIG_NET_UDP_TUNNEL. Reported-by: Baptiste Jonglez <baptiste@bitsofnetworks.org> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/generic/patches-3.18/263-udp_tunnel_kconfig_hack.patch11
-rw-r--r--target/linux/generic/patches-4.1/263-udp_tunnel_kconfig_hack.patch11
-rw-r--r--target/linux/generic/patches-4.4/263-udp_tunnel_kconfig_hack.patch11
3 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/263-udp_tunnel_kconfig_hack.patch b/target/linux/generic/patches-3.18/263-udp_tunnel_kconfig_hack.patch
new file mode 100644
index 0000000000..e8fb296698
--- /dev/null
+++ b/target/linux/generic/patches-3.18/263-udp_tunnel_kconfig_hack.patch
@@ -0,0 +1,11 @@
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -308,7 +308,7 @@ config NET_IPVTI
+ on top.
+
+ config NET_UDP_TUNNEL
+- tristate
++ tristate "IP: UDP tunnel"
+ select NET_IP_TUNNEL
+ default n
+
diff --git a/target/linux/generic/patches-4.1/263-udp_tunnel_kconfig_hack.patch b/target/linux/generic/patches-4.1/263-udp_tunnel_kconfig_hack.patch
new file mode 100644
index 0000000000..e8fb296698
--- /dev/null
+++ b/target/linux/generic/patches-4.1/263-udp_tunnel_kconfig_hack.patch
@@ -0,0 +1,11 @@
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -308,7 +308,7 @@ config NET_IPVTI
+ on top.
+
+ config NET_UDP_TUNNEL
+- tristate
++ tristate "IP: UDP tunnel"
+ select NET_IP_TUNNEL
+ default n
+
diff --git a/target/linux/generic/patches-4.4/263-udp_tunnel_kconfig_hack.patch b/target/linux/generic/patches-4.4/263-udp_tunnel_kconfig_hack.patch
new file mode 100644
index 0000000000..e8fb296698
--- /dev/null
+++ b/target/linux/generic/patches-4.4/263-udp_tunnel_kconfig_hack.patch
@@ -0,0 +1,11 @@
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -308,7 +308,7 @@ config NET_IPVTI
+ on top.
+
+ config NET_UDP_TUNNEL
+- tristate
++ tristate "IP: UDP tunnel"
+ select NET_IP_TUNNEL
+ default n
+