aboutsummaryrefslogtreecommitdiff
path: root/net/bridge-utils
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2020-07-15 17:07:07 -0700
committerRosen Penev <rosenp@gmail.com>2020-07-15 19:14:34 -0700
commit588c5d2041cff2784d8cc203464802d8fc9cbdad (patch)
treec58fa66bcaf78cd986ba229f1256106335fd2b07 /net/bridge-utils
parent6b269abde884539f556131ffa67375901a6824a0 (diff)
bridge-utils: update to 1.7
Changed URL to new upstream. Use PKG_INSTALL for consistency between packages. Use PKG_BUILD_PARALLEL for faster compilation. Remove outdated patch. Minor cleanups. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net/bridge-utils')
-rw-r--r--net/bridge-utils/Makefile19
-rw-r--r--net/bridge-utils/patches/001-libbridge_cflags.patch11
2 files changed, 10 insertions, 20 deletions
diff --git a/net/bridge-utils/Makefile b/net/bridge-utils/Makefile
index e9e3472dc..b5511cd41 100644
--- a/net/bridge-utils/Makefile
+++ b/net/bridge-utils/Makefile
@@ -9,17 +9,20 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=bridge-utils
-PKG_VERSION:=1.6
-PKG_RELEASE:=3
+PKG_VERSION:=1.7
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/utils/net/$(PKG_NAME)
-PKG_HASH:=cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8
-PKG_MAINTAINER:=Nikolay Martynov <mar.kolya@gmail.com>
+PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/shemminger/bridge-utils
+PKG_HASH:=939987e659b1a4c36ae46f44b6687f373bc5c916a9eab91f775630f5e38b997e
+PKG_MAINTAINER:=Nikolay Martynov <mar.kolya@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
+
PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
@@ -36,14 +39,12 @@ define Package/bridge/description
form a larger network.
endef
-TARGET_CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-
CONFIGURE_ARGS += \
- --with-linux-headers="$(LINUX_DIR)" \
+ --with-linux-headers="$(LINUX_DIR)"
define Package/bridge/install
$(INSTALL_DIR) $(1)/usr/libexec
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/libexec/bridge-utils-brctl
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/brctl $(1)/usr/libexec/bridge-utils-brctl
endef
$(eval $(call BuildPackage,bridge))
diff --git a/net/bridge-utils/patches/001-libbridge_cflags.patch b/net/bridge-utils/patches/001-libbridge_cflags.patch
deleted file mode 100644
index e35a64947..000000000
--- a/net/bridge-utils/patches/001-libbridge_cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libbridge/Makefile.in
-+++ b/libbridge/Makefile.in
-@@ -5,7 +5,7 @@ AR=ar
- RANLIB=@RANLIB@
-
- CC=@CC@
--CFLAGS = -Wall -g $(KERNEL_HEADERS)
-+CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS)
-
- prefix=@prefix@
- exec_prefix=@exec_prefix@