diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2019-07-12 07:50:21 +0000 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2019-07-12 07:52:38 +0000 |
| commit | 627bb0b8dc75a0a57cdd808ccd6880f67fe959d6 (patch) | |
| tree | 7c1c79b58a6fada306c98c48433ead9446dc40dd /package | |
| parent | e6af9c017b0cb4f24308b1b6e8e3cf288a8ce619 (diff) | |
| download | upstream-627bb0b8dc75a0a57cdd808ccd6880f67fe959d6.tar.gz upstream-627bb0b8dc75a0a57cdd808ccd6880f67fe959d6.tar.bz2 upstream-627bb0b8dc75a0a57cdd808ccd6880f67fe959d6.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 62be427067ee3883b68bcfb08dfc0c43dce22fa3)
Diffstat (limited to 'package')
| -rw-r--r-- | package/utils/busybox/Makefile | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 3aaa7cdd98..acb00914cd 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -38,6 +38,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 @@ -46,20 +48,6 @@ define Package/busybox URL:=http://busybox.net/ DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc +BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter MENU:=1 - ALTERNATIVES:=\ - $(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) \ - endef define Package/busybox/description |