Skip to contentSkip to conversation

bridge-utils: bump to version 1.6

PATCH New Baruch Siach 2 participants 2 messages Oct 27, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bridge-utils: bump to version 1.6

Drop upstream patches.

Change download and homepage to kernel.org, and use .xz tarball.

---
 .../0002-fix-for-kernel-headers-3.8+.patch         | 30 --------
 package/bridge-utils/0003-sysfs-write-fixes.patch  | 81 ----------------------
 package/bridge-utils/Config.in                     |  2 +-
 package/bridge-utils/bridge-utils.hash             |  5 +-
 package/bridge-utils/bridge-utils.mk               |  5 +-
 5 files changed, 6 insertions(+), 117 deletions(-)
 delete mode 100644 package/bridge-utils/0002-fix-for-kernel-headers-3.8+.patch
 delete mode 100644 package/bridge-utils/0003-sysfs-write-fixes.patch
package/bridge-utils/0002-fix-for-kernel-headers-3.8+.patch deleted +0 -30
deleted file mode 100644
index 0455a9085cc1..000000000000
@@ -1,30 +0,0 @@
-commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d
-Author: Russell Senior <[email protected]>
-Date:   Wed Mar 6 12:49:42 2013 -0800
-
-    bridge-utils: Fix compile against linux-3.8.x
-    
-    Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a
-    struct in6_addr but doesn't define it.  The trivial seeming fix of
-    including the header that does define it causes more problems.  The
-    problem was discussed on mailing lists in January 2013.  The final
-    suggestion I found was here:
-    
-          http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
-    
-    This is intended to implement that suggestion.
-    
-    Signed-off-by: Russell Senior <[email protected]>
-
-diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
-index 39964f2..dd14bae 100644
---- a/libbridge/libbridge.h
-+++ b/libbridge/libbridge.h
-@@ -20,6 +20,7 @@
- #define _LIBBRIDGE_H
- 
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <linux/if.h>
- #include <linux/if_bridge.h>
- 
package/bridge-utils/0003-sysfs-write-fixes.patch deleted +0 -81

81 lines not on this page · raw message

package/bridge-utils/Config.in +1 -1
index 537eb1f59fd7..fb9c7df4274f 100644
@@ -4,4 +4,4 @@ config BR2_PACKAGE_BRIDGE_UTILS
 	  Manage ethernet bridging; a way to connect networks together to
 	  form a larger network.
 
-	  http://linux-net.osdl.org/index.php/Bridge
+	  https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/
package/bridge-utils/bridge-utils.hash +2 -3
index c85fd04154bd..e699b24a6386 100644
@@ -1,3 +1,2 @@
-# From http://sourceforge.net/projects/bridge/files/bridge/
-md5	ec7b381160b340648dede58c31bb2238	bridge-utils-1.5.tar.gz
-sha1	19d2a58cd3a70f971aa931b40256174a847e60d6	bridge-utils-1.5.tar.gz
+# From https://www.kernel.org/pub/linux/utils/net/bridge-utils/sha256sums.asc
+sha256 cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8 bridge-utils-1.6.tar.xz
package/bridge-utils/bridge-utils.mk +3 -2
index ae4c4197c789..efe57cd97999 100644
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-BRIDGE_UTILS_VERSION = 1.5
-BRIDGE_UTILS_SITE = http://downloads.sourceforge.net/project/bridge/bridge
+BRIDGE_UTILS_VERSION = 1.6
+BRIDGE_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/bridge-utils
+BRIDGE_UTILS_SOURCE = bridge-utils-1.6.tar.xz
 BRIDGE_UTILS_AUTORECONF = YES
 BRIDGE_UTILS_CONF_OPTS = --with-linux-headers=$(LINUX_HEADERS_DIR)
 BRIDGE_UTILS_LICENSE = GPLv2+
Signature · 1 line
2.9.3
#1 lore raw

PATCH 1/1 bridge-utils: bump to version 1.6

Hello,

Quoted 5 lines · Baruch Siach

Drop upstream patches.

Change download and homepage to kernel.org, and use .xz tarball.

Quoted 9 lines
---
 .../0002-fix-for-kernel-headers-3.8+.patch         | 30 --------
 package/bridge-utils/0003-sysfs-write-fixes.patch  | 81 ----------------------
 package/bridge-utils/Config.in                     |  2 +-
 package/bridge-utils/bridge-utils.hash             |  5 +-
 package/bridge-utils/bridge-utils.mk               |  5 +-
 5 files changed, 6 insertions(+), 117 deletions(-)
 delete mode 100644 package/bridge-utils/0002-fix-for-kernel-headers-3.8+.patch
 delete mode 100644 package/bridge-utils/0003-sysfs-write-fixes.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com