From ef44ef69808f1a8bacd50b49dd796592e0504960 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Fri, 7 Jun 2019 22:52:44 +0300 Subject: [PATCH] bridge-utils: fix conflict with busybox brctl 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 [PKG_RELEASE bump] Signed-off-by: Yousong Zhou (cherry-picked from commit fabd9efdea6a57dfc58d9c57f5b31cb1ee4aa9a0) --- net/bridge-utils/Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/net/bridge-utils/Makefile b/net/bridge-utils/Makefile index 00c63ea44..2d4d8e8da 100644 --- a/net/bridge-utils/Makefile +++ b/net/bridge-utils/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=bridge-utils PKG_VERSION:=1.5 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE_PROTO:=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 URL:=http://bridge.sourceforge.net/ PKG_MAINTAINER:=Nikolay Martynov + ALTERNATIVES:=300:/usr/sbin/brctl:/usr/libexec/bridge-utils-brctl endef define Package/bridge/description @@ -44,15 +45,8 @@ CONFIGURE_ARGS += \ --with-linux-headers="$(LINUX_DIR)" \ define Package/bridge/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin -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 + $(INSTALL_DIR) $(1)/usr/libexec + $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/libexec/bridge-utils-brctl endef $(eval $(call BuildPackage,bridge))