Bump Buildroot to 2021.02-rc3 (#1260)
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
Stefan Agner
@@ -1,8 +1,48 @@
|
||||
config BR2_PACKAGE_SYSKLOGD
|
||||
bool "syslogd & klogd"
|
||||
bool "sysklogd"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
help
|
||||
System log daemons syslogd and klogd.
|
||||
The continuation of the original sysklogd package, based on
|
||||
the original Berkeley syslog daemon. Now with kernel
|
||||
logging, and log rotation built-in. It can both receive from
|
||||
and send to remote syslog servers. The v2.x series include
|
||||
extended support for RFC5424 with an alt. syslogp() API for
|
||||
clients.
|
||||
|
||||
https://github.com/troglobit/sysklogd/
|
||||
|
||||
if BR2_PACKAGE_SYSKLOGD
|
||||
|
||||
config BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY
|
||||
int "Retry delay (sec)"
|
||||
default "180"
|
||||
help
|
||||
Retry delay (seconds) for sending to remote syslog servers.
|
||||
|
||||
When set up to forward logs to a remote syslog server, the
|
||||
network may not always be available. E.g., default interface
|
||||
down, or no route to the remote server. This setting controls
|
||||
the back-off time before retrying.
|
||||
|
||||
Default: 180 seconds
|
||||
|
||||
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
|
||||
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
DAEMON="klogd"
|
||||
PIDFILE="/var/run/$DAEMON.pid"
|
||||
|
||||
KLOGD_ARGS=""
|
||||
|
||||
KLOGD_RELOAD="0"
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
|
||||
|
||||
start() {
|
||||
printf 'Starting %s: ' "$DAEMON"
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
start-stop-daemon -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
|
||||
-- $KLOGD_ARGS
|
||||
status=$?
|
||||
if [ "$status" -eq 0 ]; then
|
||||
echo "OK"
|
||||
else
|
||||
echo "FAIL"
|
||||
fi
|
||||
return "$status"
|
||||
}
|
||||
|
||||
stop() {
|
||||
printf 'Stopping %s: ' "$DAEMON"
|
||||
start-stop-daemon -K -q -p "$PIDFILE"
|
||||
status=$?
|
||||
if [ "$status" -eq 0 ]; then
|
||||
echo "OK"
|
||||
else
|
||||
echo "FAIL"
|
||||
fi
|
||||
return "$status"
|
||||
}
|
||||
|
||||
restart() {
|
||||
stop
|
||||
sleep 1
|
||||
start
|
||||
}
|
||||
|
||||
# SIGUSR1 makes klogd reload kernel module symbols
|
||||
# SIGUSR2 makes klogd reload static kernel symbols and kernel module symbols
|
||||
reload() {
|
||||
printf 'Reloading %s: ' "$DAEMON"
|
||||
start-stop-daemon -K -s "$KLOGD_RELOAD" -q -p "$PIDFILE"
|
||||
status=$?
|
||||
if [ "$status" -eq 0 ]; then
|
||||
echo "OK"
|
||||
else
|
||||
echo "FAIL"
|
||||
fi
|
||||
return "$status"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start|stop|restart|reload)
|
||||
"$1";;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|reload}"
|
||||
exit 1
|
||||
esac
|
||||
@@ -1,11 +0,0 @@
|
||||
[Unit]
|
||||
Description=Kernel Log Daemon
|
||||
|
||||
[Service]
|
||||
ExecStart=/sbin/klogd -n
|
||||
StandardOutput=null
|
||||
Restart=on-failure
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
WantedBy=syslogd.service
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 1e9e18564c5bba474954d55ea6e2a0e3dc1bc145d8973c5fd098b088a9be9ceb sysklogd-1.6.tar.gz
|
||||
sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING
|
||||
sha256 a93b7ad6a615336f030d8a3257544cff1644908af6a12c65f65482f27bd39ca9 sysklogd-2.2.1.tar.gz
|
||||
sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE
|
||||
|
||||
@@ -4,16 +4,28 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SYSKLOGD_VERSION = 1.6
|
||||
SYSKLOGD_SITE = $(call github,troglobit,sysklogd,v$(SYSKLOGD_VERSION))
|
||||
SYSKLOGD_LICENSE = GPL-2.0+
|
||||
SYSKLOGD_LICENSE_FILES = COPYING
|
||||
# From git
|
||||
SYSKLOGD_AUTORECONF = YES
|
||||
SYSKLOGD_CONF_OPTS = --exec-prefix=/
|
||||
SYSKLOGD_VERSION = 2.2.1
|
||||
SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION)
|
||||
SYSKLOGD_LICENSE = BSD-3-Clause
|
||||
SYSKLOGD_LICENSE_FILES = LICENSE
|
||||
SYSKLOGD_CPE_ID_VALID = YES
|
||||
|
||||
# Busybox install logger in /usr/bin, and syslogd in /sbin, so install in
|
||||
# the same locations so that busybox does not install its applets in there.
|
||||
SYSKLOGD_CONF_OPTS = \
|
||||
--bindir=/usr/bin \
|
||||
--sbindir=/sbin \
|
||||
--with-suspend-time=$(BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY)
|
||||
|
||||
# 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 \
|
||||
$(INSTALL) -D -m 0644 $(@D)/syslog.conf \
|
||||
$(TARGET_DIR)/etc/syslog.conf
|
||||
endef
|
||||
|
||||
@@ -22,15 +34,11 @@ SYSKLOGD_POST_INSTALL_TARGET_HOOKS += SYSKLOGD_INSTALL_SAMPLE_CONFIG
|
||||
define SYSKLOGD_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 755 -D package/sysklogd/S01syslogd \
|
||||
$(TARGET_DIR)/etc/init.d/S01syslogd
|
||||
$(INSTALL) -m 755 -D package/sysklogd/S02klogd \
|
||||
$(TARGET_DIR)/etc/init.d/S02klogd
|
||||
endef
|
||||
|
||||
define SYSKLOGD_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/syslogd.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/syslogd.service
|
||||
$(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/klogd.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/klogd.service
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
# /etc/syslog.conf - Configuration file for syslogd
|
||||
|
||||
auth,authpriv.* /var/log/auth.log
|
||||
*.*;auth,authpriv.none /var/log/messages
|
||||
user.* /var/log/user.log
|
||||
|
||||
*.emerg *
|
||||
@@ -1,10 +1,10 @@
|
||||
[Unit]
|
||||
Description=System Logging Service
|
||||
Requires=syslog.socket
|
||||
Wants=klogd.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/sbin/syslogd -m 0 -n
|
||||
EnvironmentFile=-/etc/default/syslogd
|
||||
ExecStart=/sbin/syslogd -m 0 -F $SYSLOGD_ARGS
|
||||
StandardOutput=null
|
||||
Restart=on-failure
|
||||
|
||||
|
||||
Reference in New Issue
Block a user