mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

logmngr: install logread to /sbin

Browse source 
It was being installed to /usr/sbin as workaround for conflict with
logd package. The correct solution is to not select logd package.
This commit is contained in:
Erik Karlsson 2025-04-15 09:22:16 +02:00
parent ffab63b86f
commit 5874a005c6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
logmngr/Makefile
View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=logmngr PKG_NAME:=logmngr
PKG_VERSION:=1.0.14 PKG_VERSION:=1.0.15
LOCAL_DEV:=0 LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1) ifneq ($(LOCAL_DEV),1)
@ -33,6 +33,7 @@ define Package/logmngr
DEPENDS+=+LOGMNGR_BACKEND_SYSLOG_NG:syslog-ng DEPENDS+=+LOGMNGR_BACKEND_SYSLOG_NG:syslog-ng
DEPENDS+=+LOGMNGR_LOGROTATE:logrotate DEPENDS+=+LOGMNGR_LOGROTATE:logrotate
DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
CONFLICTS:=logd
endef endef
define Package/logmngr/description 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_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/
$(INSTALL_DIR) $(1)/usr/libexec $(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) ./files/logmngr-klogd $(1)/usr/libexec/ $(INSTALL_BIN) ./files/logmngr-klogd $(1)/usr/libexec/
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) ./files/logread $(1)/usr/sbin/ $(INSTALL_BIN) ./files/logread $(1)/sbin/
endif endif
ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y) ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/ $(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/