busybox-suite: move runit and log utilities to main busybox

7 files changed, 65 insertions, 64 deletions

diff --git a/core/busybox-init/checksums b/core/busybox-init/checksums
index 0caf041a..a4a5fd0d 100644
--- a/core/busybox-init/checksums
+++ b/core/busybox-init/checksums
@@ -1,2 +1,2 @@
 d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998  busybox-1.31.1.tar.bz2
-82452722afcd7a9303f5c54588033f90811a65e7be2ce2a1973df73d4e8fd4d0  .config
+24d8b05873e6a59c30cf66e3387e387965fb3cc2143ebba8a0d1b92a796d5cbe  .config
diff --git a/core/busybox-init/depends b/core/busybox-init/depends
index 49b59d3f..3eec0a43 100644
--- a/core/busybox-init/depends
+++ b/core/busybox-init/depends
@@ -2,3 +2,4 @@ bzip2
 gzip
 libressl make
 linux-headers make
+carbs-init
diff --git a/core/busybox-init/files/.config b/core/busybox-init/files/.config
index 07941dfa..39382d8f 100644
--- a/core/busybox-init/files/.config
+++ b/core/busybox-init/files/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.31.1
-# Thu Jan  9 11:38:23 2020
+# Mon Jan 13 15:31:33 2020
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -1035,19 +1035,19 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 # Runit Utilities
 #
-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_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_CHCON is not set
 # CONFIG_GETENFORCE is not set
 # CONFIG_GETSEBOOL is not set
@@ -1143,21 +1143,17 @@ CONFIG_BASH_IS_NONE=y
 #
 # System Logging Utilities
 #
-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
+# 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
diff --git a/core/busybox-init/version b/core/busybox-init/version
index 65feea05..0e783297 100644
--- a/core/busybox-init/version
+++ b/core/busybox-init/version
@@ -1 +1 @@
-1.31.1 2
+1.31.1 3
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