[openwrt/openwrt] ubox: make logread as an alternative
LEDE Commits
lede-commits at lists.infradead.org
Thu Mar 7 23:38:53 PST 2024
981213 pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/9da90971ab32c29eb014eea7094d0b4ebdf256e3
commit 9da90971ab32c29eb014eea7094d0b4ebdf256e3
Author: Sergey Ponomarev <stokito at gmail.com>
AuthorDate: Sat Mar 2 23:50:58 2024 +0200
ubox: make logread as an alternative
The logread can be replaced with syslog-ng.
To support this it should be an alternative itself.
Signed-off-by: Sergey Ponomarev <stokito at gmail.com>
---
package/system/ubox/Makefile | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index e74ae00b3f..adfb68e55b 100644
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ubox
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
@@ -47,6 +47,7 @@ define Package/logd
DEPENDS:=+libubox +libubus +libblobmsg-json +libudebug
TITLE:=OpenWrt system log implementation
USERID:=logd=514:logd=514
+ ALTERNATIVES:=200:/sbin/logread:/usr/libexec/logread-ubox
endef
define Package/getrandom/install
@@ -63,9 +64,10 @@ define Package/ubox/install
endef
define Package/logd/install
- $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/ $(1)/usr/share/acl.d
+ $(INSTALL_DIR) $(1)/sbin $(1)/usr/libexec/ $(1)/etc/init.d/ $(1)/usr/share/acl.d
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/logd $(1)/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/logread $(1)/usr/libexec/logread-ubox
$(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
$(INSTALL_DATA) ./files/logd.json $(1)/usr/share/acl.d
endef
More information about the lede-commits
mailing list