aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2019-06-14 01:49:42 +0000
committerYousong Zhou <yszhou4tech@gmail.com>2019-07-12 09:17:34 +0000
commit1c3587cad9157c46d6ce82bce9a5300c65b52a30 (patch)
tree334ade583598876e1bd564e46c8c3fcb8ef24043 /package/utils
parent8936bdb2697f5c7689a38f86641466725637094f (diff)
downloadupstream-1c3587cad9157c46d6ce82bce9a5300c65b52a30.tar.gz
upstream-1c3587cad9157c46d6ce82bce9a5300c65b52a30.tar.bz2
upstream-1c3587cad9157c46d6ce82bce9a5300c65b52a30.zip
busybox: strip off ALTERNATIVES spec
Now that busybox is a known alternatives provider by opkg, we remove the ALTERNATIVES spec and add a note to make the implicit situation clear Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> (cherry-picked from commit 62be427067ee3883b68bcfb08dfc0c43dce22fa3)
Diffstat (limited to 'package/utils')
-rw-r--r--package/utils/busybox/Makefile22
1 files changed, 3 insertions, 19 deletions
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index aa16dc80f3..9b80ed1f5e 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:=4
+PKG_RELEASE:=5
PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -37,6 +37,8 @@ endif
BUSYBOX_SYM=$(if $(CONFIG_BUSYBOX_CUSTOM),CONFIG,DEFAULT)
BUSYBOX_IF_ENABLED=$(if $(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_$(1)),$(2))
+# All files provided by busybox will serve as fallback alternatives by opkg.
+# There should be no need to enumerate ALTERNATIVES entries here
define Package/busybox
SECTION:=base
CATEGORY:=Base system
@@ -45,24 +47,6 @@ define Package/busybox
URL:=http://busybox.net/
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) \
- $(call BUSYBOX_IF_ENABLED,IP, 100:/sbin/ip:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,KILL, 100:/bin/kill:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,PGREP, 100:/usr/bin/pgrep:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,PKILL, 100:/usr/bin/pkill:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,PMAP, 100:/usr/bin/pmap:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,PS, 100:/bin/ps:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,PWDX, 100:/usr/bin/pwdx:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,TOP, 100:/usr/bin/top:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,UPTIME, 100:/usr/bin/uptime:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,WATCH, 100:/bin/watch:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,WGET, 100:/usr/bin/wget:/bin/busybox) \
- $(call BUSYBOX_IF_ENABLED,XARGS, 100:/usr/bin/xargs:/bin/busybox) \
-
endef
define Package/busybox/description