Просмотр исходного кода

package/sysklogd: add option to enable native logger

Installs to /usr/bin and thus replaces the BusyBox logger if enabled.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
[yann.morin.1998@free.fr: use usual ifeq-else-endif block]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Joachim Wiberg 4 лет назад
Родитель
Сommit
99cff5ef74
2 измененных файлов с 24 добавлено и 1 удалено
  1. 16 0
      package/sysklogd/Config.in
  2. 8 1
      package/sysklogd/sysklogd.mk

+ 16 - 0
package/sysklogd/Config.in

@@ -13,6 +13,22 @@ config BR2_PACKAGE_SYSKLOGD
 
 	  https://github.com/troglobit/sysklogd/
 
+if BR2_PACKAGE_SYSKLOGD
+
+config BR2_PACKAGE_SYSKLOGD_LOGGER
+	bool "logger tool"
+	help
+	  Generate log messages from scripts or from the command line.
+
+	  This version of logger is receommended for use with sysklogd.
+	  It makes use of the new syslogp() API for RFC5424 style logs,
+	  e.g. MSGID, strucutred data (SD), etc.
+
+	  The BusyBox, or util-linux, logger tools can also be used, but
+	  are limited to RFC3164 style messages.
+
+endif
+
 comment "sysklogd needs a toolchain w/ threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS

+ 8 - 1
package/sysklogd/sysklogd.mk

@@ -9,7 +9,14 @@ SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKL
 SYSKLOGD_LICENSE = BSD-3-Clause
 SYSKLOGD_LICENSE_FILES = LICENSE
 SYSKLOGD_CPE_ID_VALID = YES
-SYSKLOGD_CONF_OPTS = --exec-prefix=/ --without-logger
+SYSKLOGD_CONF_OPTS = --exec-prefix=/
+
+# Disable/Enable utilities
+ifeq ($(BR2_PACKAGE_SYSKLOGD_LOGGER),y)
+SYSKLOGD_CONF_OPTS += --with-logger
+else
+SYSKLOGD_CONF_OPTS += --without-logger
+endif
 
 define SYSKLOGD_INSTALL_SAMPLE_CONFIG
 	$(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \