cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

bridge-utils: fix conflict with busybox brctl

Browse Source 
Busybox brctl applet conflicts with the version from bridge-utils.
Fix this by using ALTERNATIVE support for brctl in bridge-utils.

Fixes openwrt/packages#8812

Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
[PKG_RELEASE bump]
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from commit fabd9efdea)
This commit is contained in:
Konstantin Demin
2019-06-07 22:52:44 +03:00
committed by Yousong Zhou
parent f424f7dfae
commit ef44ef6980
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/bridge-utils/Makefile
+4 -10
View File
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=bridge-utils PKG_NAME:=bridge-utils
PKG_VERSION:=1.5 PKG_VERSION:=1.5
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git
@@ -31,6 +31,7 @@ define Package/bridge
TITLE:=Ethernet bridging configuration utility TITLE:=Ethernet bridging configuration utility
URL:=http://bridge.sourceforge.net/ URL:=http://bridge.sourceforge.net/
PKG_MAINTAINER:=Nikolay Martynov <mar.kolya@gmail.com> PKG_MAINTAINER:=Nikolay Martynov <mar.kolya@gmail.com>
ALTERNATIVES:=300:/usr/sbin/brctl:/usr/libexec/bridge-utils-brctl
endef endef
define Package/bridge/description define Package/bridge/description
@@ -44,15 +45,8 @@ CONFIGURE_ARGS += \
--with-linux-headers="$(LINUX_DIR)" \ --with-linux-headers="$(LINUX_DIR)" \
define Package/bridge/install define Package/bridge/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/libexec/bridge-utils-brctl
endef
define Package/bridge/prerm
#!/bin/sh
$${IPKG_INSTROOT}/bin/busybox brctl -h 2>&1 | grep -q BusyBox && \
ln -sf ../../bin/busybox $${IPKG_INSTROOT}/usr/sbin/brctl
exit 0
endef endef
$(eval $(call BuildPackage,bridge)) $(eval $(call BuildPackage,bridge))