[ptxdist] [PATCH] bridge-utils: version bump 1.5 -> 1.6

[ptxdist] [PATCH] bridge-utils: version bump 1.5 -> 1.6

[Lucas Stach]

- 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>
---
 ...-linux-in6.h-to-build-with-newer-kernel-h.patch | 24 ----------------------
 patches/bridge-utils-1.5/series                    |  4 ----
 .../autogen.sh                                     |  0
 rules/bridge-utils.make                            | 12 ++++++++---
 4 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch
 delete mode 100644 patches/bridge-utils-1.5/series
 rename patches/{bridge-utils-1.5 => bridge-utils-1.6}/autogen.sh (100%)

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 602ba6dcf792..000000000000
--- 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 064d4211c808..000000000000
--- 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
similarity index 100%
rename from patches/bridge-utils-1.5/autogen.sh
rename to patches/bridge-utils-1.6/autogen.sh
diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make
index f83f0a3ac3fe..57fe18dd931f 100644
--- a/rules/bridge-utils.make
+++ b/rules/bridge-utils.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_BRIDGE_UTILS) += bridge-utils
 #
 # Paths and names
 #
-BRIDGE_UTILS_VERSION	:= 1.5
-BRIDGE_UTILS_MD5	:= ec7b381160b340648dede58c31bb2238
+BRIDGE_UTILS_VERSION	:= 1.6
+BRIDGE_UTILS_MD5	:= f369e90e85e4bb46baa26a7b9d66b578
 BRIDGE_UTILS		:= bridge-utils-$(BRIDGE_UTILS_VERSION)
 BRIDGE_UTILS_SUFFIX	:= tar.gz
-BRIDGE_UTILS_URL	:= $(call ptx/mirror, SF, bridge/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX))
+BRIDGE_UTILS_URL	:= https://www.kernel.org/pub/linux/utils/net/bridge-utils/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
 BRIDGE_UTILS_SOURCE	:= $(SRCDIR)/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
 BRIDGE_UTILS_DIR	:= $(BUILDDIR)/$(BRIDGE_UTILS)
 BRIDGE_UTILS_LICENSE	:= GPL-2.0-or-later
@@ -36,6 +36,12 @@ BRIDGE_UTILS_LICENSE	:= GPL-2.0-or-later
 #
 BRIDGE_UTILS_CONF_TOOL	:= autoconf
 
+# Set with-linux-headers to something that doesn't exist to avoid the default
+# path picking up a path from the build host.
+BRIDGE_UTILS_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-linux-headers=/this/path/must/not/exist
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de