diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2018-05-04 16:47:28 +0800 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2018-05-07 15:50:18 +0800 |
| commit | f87dff8f72097bd1f63b4921055060271eae977c (patch) | |
| tree | 9942c4c390dcd283a1c70f2481b037de66531784 | |
| parent | 46a2c0d9c565574671e22751ed5c8407f664f103 (diff) | |
| download | upstream-f87dff8f72097bd1f63b4921055060271eae977c.tar.gz upstream-f87dff8f72097bd1f63b4921055060271eae977c.tar.bz2 upstream-f87dff8f72097bd1f63b4921055060271eae977c.zip | |
flock: enable alternatives support
Fixes FS#1510
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
| -rw-r--r-- | package/utils/busybox/Makefile | 3 | ||||
| -rw-r--r-- | package/utils/util-linux/Makefile | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index e454b0daff..1238bc83f0 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.28.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_FLAGS:=essential PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -47,6 +47,7 @@ define Package/busybox 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) \ diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 8986593064..5d31e6d993 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux PKG_VERSION:=2.32 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.32 @@ -198,6 +198,7 @@ endef define Package/flock $(call Package/util-linux/Default) TITLE:=manage locks from shell scripts + ALTERNATIVES:=200:/usr/bin/flock:/usr/bin/util-linux-flock endef define Package/flock/description @@ -591,7 +592,7 @@ endef define Package/flock/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/flock $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/flock $(1)/usr/bin/util-linux-flock endef define Package/fstrim/install |