[openwrt/openwrt] logger: enable alternatives support
LEDE Commits
lede-commits at lists.infradead.org
Fri Jun 26 18:19:23 EDT 2020
hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/67575b64107d39096195aaaa13b2c2986a5ff97f
commit 67575b64107d39096195aaaa13b2c2986a5ff97f
Author: Huangbin Zhan <zhanhb88 at gmail.com>
AuthorDate: Wed Jun 10 07:11:08 2020 +0800
logger: enable alternatives support
Avoid conflict with busybox
Signed-off-by: Huangbin Zhan <zhanhb88 at gmail.com>
---
package/utils/util-linux/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index 77b4b98b56..3953d83238 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.35.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.35
@@ -267,6 +267,7 @@ endef
define Package/logger
$(call Package/util-linux/Default)
TITLE:=a shell command interface to the syslog system log module
+ ALTERNATIVES:=200:/usr/bin/logger:/usr/bin/util-linux-logger
endef
define Package/logger/description
@@ -659,7 +660,7 @@ endef
define Package/logger/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/logger $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/logger $(1)/usr/bin/util-linux-logger
endef
define Package/look/install
More information about the lede-commits
mailing list