From: Yousong Zhou Date: Fri, 4 May 2018 08:43:12 +0000 (+0800) Subject: busybox: order alternatives in alphabetical order X-Git-Tag: v18.06.0-rc1~248 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=46a2c0d9c565574671e22751ed5c8407f664f103;p=oweals%2Fopenwrt.git busybox: order alternatives in alphabetical order Signed-off-by: Yousong Zhou --- diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 155fc71d6d..e454b0daff 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -47,17 +47,17 @@ define Package/busybox DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc +BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter MENU:=1 ALTERNATIVES:=\ - $(call BUSYBOX_IF_ENABLED,KILL, 100:/bin/kill:/bin/busybox) \ - $(call BUSYBOX_IF_ENABLED,PS, 100:/bin/ps:/bin/busybox) \ - $(call BUSYBOX_IF_ENABLED,WATCH, 100:/bin/watch:/bin/busybox) \ - $(call BUSYBOX_IF_ENABLED,IP, 100:/sbin/ip:/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