From 5874a005c61012ba1ad99e6cce989f21a7f264e5 Mon Sep 17 00:00:00 2001 From: Erik Karlsson Date: Tue, 15 Apr 2025 09:22:16 +0200 Subject: [PATCH] logmngr: install logread to /sbin It was being installed to /usr/sbin as workaround for conflict with logd package. The correct solution is to not select logd package. --- logmngr/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/logmngr/Makefile b/logmngr/Makefile index 854f1a6ac..61ab31849 100644 --- a/logmngr/Makefile +++ b/logmngr/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=logmngr -PKG_VERSION:=1.0.14 +PKG_VERSION:=1.0.15 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) @@ -33,6 +33,7 @@ define Package/logmngr DEPENDS+=+LOGMNGR_BACKEND_SYSLOG_NG:syslog-ng DEPENDS+=+LOGMNGR_LOGROTATE:logrotate DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service + CONFLICTS:=logd endef define Package/logmngr/description @@ -62,8 +63,8 @@ ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y) $(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/ $(INSTALL_DIR) $(1)/usr/libexec $(INSTALL_BIN) ./files/logmngr-klogd $(1)/usr/libexec/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) ./files/logread $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) ./files/logread $(1)/sbin/ endif ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y) $(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/