diff options
| author | Konstantin Demin <rockdrilla@gmail.com> | 2019-06-07 22:57:34 +0300 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-06-08 13:51:40 +0200 |
| commit | 10011f91c5cffd0863bbec98a8da403c82354c8d (patch) | |
| tree | 1c6d9c28979d92eb296980b1b3aaeecfbfc53160 /package/utils | |
| parent | 0f4e65ec7bd572bd9506867886fb99d59d028a3c (diff) | |
| download | upstream-10011f91c5cffd0863bbec98a8da403c82354c8d.tar.gz upstream-10011f91c5cffd0863bbec98a8da403c82354c8d.tar.bz2 upstream-10011f91c5cffd0863bbec98a8da403c82354c8d.zip | |
busybox: add ALTERNATIVES for brctl
Busybox brctl applet conflicts with the version from bridge-utils.
Fix this by using ALTERNATIVE support for brctl in busybox.
Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [PKG_RELEASE increase]
Diffstat (limited to 'package/utils')
| -rw-r--r-- | package/utils/busybox/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index ff25a35b6e..aa16dc80f3 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox PKG_VERSION:=1.30.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_FLAGS:=essential PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -46,6 +46,7 @@ define Package/busybox DEPENDS:=+BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter MENU:=1 ALTERNATIVES:=\ + $(call BUSYBOX_IF_ENABLED,BRCTL, 100:/usr/sbin/brctl:/bin/busybox) \ $(call BUSYBOX_IF_ENABLED,FIND, 100:/usr/bin/find:/bin/busybox) \ $(call BUSYBOX_IF_ENABLED,FLOCK, 100:/usr/bin/flock:/bin/busybox) \ $(call BUSYBOX_IF_ENABLED,FREE, 100:/usr/bin/free:/bin/busybox) \ |