aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/util-linux/Makefile
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2018-05-04 16:47:28 +0800
committerYousong Zhou <yszhou4tech@gmail.com>2018-05-07 15:50:18 +0800
commitf87dff8f72097bd1f63b4921055060271eae977c (patch)
tree9942c4c390dcd283a1c70f2481b037de66531784 /package/utils/util-linux/Makefile
parent46a2c0d9c565574671e22751ed5c8407f664f103 (diff)
downloadupstream-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>
Diffstat (limited to 'package/utils/util-linux/Makefile')
-rw-r--r--package/utils/util-linux/Makefile5
1 files changed, 3 insertions, 2 deletions
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