aboutsummaryrefslogtreecommitdiff
path: root/core/busybox
diff options
context:
space:
mode:
authorCem Keylan <cem@ckyln.com>2020-01-13 15:36:33 +0300
committerCem Keylan <cem@ckyln.com>2020-01-13 15:36:33 +0300
commit20a9e8a8fadaffd574b80a43c76961c1ca8c6bf0 (patch)
tree88f6f91942b296743507291e6ab3824c3f5b6908 /core/busybox
parenta87ed7232836f1270661344afd202c3c66367f57 (diff)
downloadrepository-20a9e8a8fadaffd574b80a43c76961c1ca8c6bf0.tar.gz
busybox-suite: move runit and log utilities to main busybox
Diffstat (limited to 'core/busybox')
-rw-r--r--core/busybox/checksums2
-rw-r--r--core/busybox/files/.config60
-rw-r--r--core/busybox/version2
3 files changed, 34 insertions, 30 deletions
diff --git a/core/busybox/checksums b/core/busybox/checksums
index 6a68d64a..fd71349d 100644
--- a/core/busybox/checksums
+++ b/core/busybox/checksums
@@ -1,5 +1,5 @@
d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 busybox-1.31.1.tar.bz2
-159d118dfbecdff3181ef07450a5b996230a400b826d0db840e644abddc834c1 .config
+db563080f2b10ab781727415b08f8417c1622b6b03d4638f8fa6fe8fef15302a .config
da3ef90a65abcbd112fa98a00799745d88d568cde290e049a5380dfc74de620a .config-suid
6c3eb5cf839c7a31c337df0cd8388b397e1415ffa7a63e9678552c9c63dd869f acpid.run
814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12 crond.run
diff --git a/core/busybox/files/.config b/core/busybox/files/.config
index 611f8f50..0a2e55b3 100644
--- a/core/busybox/files/.config
+++ b/core/busybox/files/.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.31.1
-# Fri Jan 10 12:16:37 2020
+# Mon Jan 13 15:33:36 2020
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -1051,19 +1051,19 @@ CONFIG_FEATURE_SHOW_THREADS=y
#
# Runit Utilities
#
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVC is not set
-# CONFIG_SVOK is not set
-# CONFIG_SVLOGD is not set
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+CONFIG_FEATURE_RUNSVDIR_LOG=y
+CONFIG_SV=y
+CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
+CONFIG_SVC=y
+CONFIG_SVOK=y
+CONFIG_SVLOGD=y
# CONFIG_CHCON is not set
# CONFIG_GETENFORCE is not set
# CONFIG_GETSEBOOL is not set
@@ -1159,17 +1159,21 @@ CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
#
# System Logging Utilities
#
-# CONFIG_KLOGD is not set
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
-# CONFIG_LOGGER is not set
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_FEATURE_KMSG_SYSLOG is not set
+CONFIG_KLOGD=y
+
+#
+# klogd should not be used together with syslog to kernel printk buffer
+#
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_FEATURE_KMSG_SYSLOG=y
diff --git a/core/busybox/version b/core/busybox/version
index a929b17a..13720308 100644
--- a/core/busybox/version
+++ b/core/busybox/version
@@ -1 +1 @@
-1.31.1 12
+1.31.1 13