summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2019-01-07 15:45:59 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-01-11 15:36:06 +0100
commitcc4bf38081df71acf465c1ca5bf13cb1a49cc172 (patch)
tree2c820256d54e0104a86966befe8289d8dd5d3a28 /patches
parent302f1dab0dc5f83e57f58b1f92761762ac3e2bcd (diff)
downloadptxdist-cc4bf38081df71acf465c1ca5bf13cb1a49cc172.tar.gz
ptxdist-cc4bf38081df71acf465c1ca5bf13cb1a49cc172.tar.xz
bridge-utils: version bump 1.5 -> 1.6
- version bump - readd with-linux-headers invalid path to avoid using the default search path, which may pick up headers from the build host Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch24
-rw-r--r--patches/bridge-utils-1.5/series4
l---------patches/bridge-utils-1.6/autogen.sh (renamed from patches/bridge-utils-1.5/autogen.sh)0
3 files changed, 0 insertions, 28 deletions
diff --git a/patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch b/patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch
deleted file mode 100644
index 602ba6dcf..000000000
--- a/patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 17 Dec 2013 10:19:29 +0100
-Subject: [PATCH] add '#include <linux/in6.h>' to build with newer kernel
- headers
-
-See also: https://lkml.org/lkml/2013/1/13/116
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- libbridge/libbridge.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
-index 39964f2..aeb094d 100644
---- a/libbridge/libbridge.h
-+++ b/libbridge/libbridge.h
-@@ -21,6 +21,7 @@
-
- #include <sys/socket.h>
- #include <linux/if.h>
-+#include <linux/in6.h>
- #include <linux/if_bridge.h>
-
- /* defined in net/if.h but that conflicts with linux/if.h... */
diff --git a/patches/bridge-utils-1.5/series b/patches/bridge-utils-1.5/series
deleted file mode 100644
index 064d4211c..000000000
--- a/patches/bridge-utils-1.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch
-# 5ef46a2f4ea5c1f3c53698f8b7251c59 - git-ptx-patches magic
diff --git a/patches/bridge-utils-1.5/autogen.sh b/patches/bridge-utils-1.6/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/bridge-utils-1.5/autogen.sh
+++ b/patches/bridge-utils-1.6/autogen.sh