busybox: slim down

diff --git a/busybox/build b/busybox/build
index 59869cf017135673a185aa8270c12d220331fa47..889945e4585d5b16bf75fa95792ee589626aaf64 100755 (executable)
--- a/busybox/build
+++ b/busybox/build
@@ -46,17 +46,11 @@ done
 # Set suid on busybox suid.
 chmod u+s "$1/usr/bin/busybox-suid"
 
-# The acpid command requires that this directory exist
-# and does not automatically create it..
-mkdir -p "$1/etc/acpid"
-
 # Install runit services.
-install -Dm755 acpid.run           "$1/etc/sv/acpid/run"
 install -Dm755 crond.run           "$1/etc/sv/crond/run"
 install -Dm755 syslogd.run         "$1/etc/sv/syslogd/run"
 install -Dm755 mdev.run            "$1/etc/sv/mdev/run"
 install -Dm755 ntpd.run            "$1/etc/sv/ntpd/run"
-ln -s /run/runit/supervise.acpid   "$1/etc/sv/acpid/supervise"
 ln -s /run/runit/supervise.crond   "$1/etc/sv/crond/supervise"
 ln -s /run/runit/supervise.syslogd "$1/etc/sv/syslogd/supervise"
 ln -s /run/runit/supervise.mdev    "$1/etc/sv/mdev/supervise"

diff --git a/busybox/checksums b/busybox/checksums
index 04bd338368239ad08c39fc8e4825c057999e3886..d71791ba8cb45da9f734707d23b326fdcc8f0877 100644 (file)
--- a/busybox/checksums
+++ b/busybox/checksums
@@ -1,7 +1,6 @@
 b0409da19243f364e401dc91e345e230dbcb83938a1815a788d0a549f43886d1
-bfd40a195e266dd4c600835e899e16840086e6105a52c5ace064994d1edad26a
+f4e598f1625af53a6cf68aa6f4ffb1b965c65e7f7096646c312812f7b1c108a1
 3764993c00fbae89f43b1ac991ebc96774afcd7aa663a434539a5f154c8d991e
-ebd61afac770d3d9cae5c411f44002496fb18b28cf7b77520072a3909852246e
 814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12
 11fe9cdb031d0c387dfb366dc9cdbabadd129f5bbed34659868914058ada11c7
 f857fea99533df7b780c911bae19b0029a70ee1c8d36b49e7782604fb9cf25f8

diff --git a/busybox/files/acpid.run b/busybox/files/acpid.run
deleted file mode 100644 (file)
index 5baf800..0000000
--- a/busybox/files/acpid.run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec acpid -f

diff --git a/busybox/files/config b/busybox/files/config
index 19bcbc29d87d71285f9982908f1849a7c45eee66..187286aa27d759b6e0c76dbf10a7c8437583ded3 100644 (file)
--- a/busybox/files/config
+++ b/busybox/files/config
@@ -199,8 +199,8 @@ CONFIG_FEATURE_LZMA_FAST=y
 #
 CONFIG_BASENAME=y
 CONFIG_CAT=y
-CONFIG_FEATURE_CATN=y
-CONFIG_FEATURE_CATV=y
+CONFIG_FEATURE_CATN=n
+CONFIG_FEATURE_CATV=n
 CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
@@ -336,9 +336,9 @@ CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
-CONFIG_WHO=y
-CONFIG_W=y
-CONFIG_USERS=y
+CONFIG_WHO=n
+CONFIG_W=n
+CONFIG_USERS=n
 CONFIG_WHOAMI=y
 CONFIG_YES=y
 
@@ -365,9 +365,9 @@ CONFIG_CLEAR=y
 # CONFIG_DEALLOCVT is not set
 CONFIG_DUMPKMAP=y
 # CONFIG_FGCONSOLE is not set
-CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
-CONFIG_SETFONT=y
+CONFIG_KBD_MODE=n
+CONFIG_LOADFONT=n
+CONFIG_SETFONT=n
 CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
 CONFIG_DEFAULT_SETFONT_DIR=""
 
@@ -376,7 +376,7 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 #
 CONFIG_FEATURE_LOADFONT_PSF2=y
 CONFIG_FEATURE_LOADFONT_RAW=y
-CONFIG_LOADKMAP=y
+CONFIG_LOADKMAP=n
 # CONFIG_OPENVT is not set
 CONFIG_RESET=y
 CONFIG_RESIZE=y
@@ -426,7 +426,7 @@ CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
+CONFIG_FEATURE_VI_REGEX_SEARCH=n
 CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
@@ -557,19 +557,19 @@ CONFIG_FSCK=y
 # Linux Module Utilities
 #
 # CONFIG_MODPROBE_SMALL is not set
-CONFIG_DEPMOD=y
-CONFIG_INSMOD=y
-CONFIG_LSMOD=y
+CONFIG_DEPMOD=n
+CONFIG_INSMOD=n
+CONFIG_LSMOD=n
 # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-CONFIG_MODINFO=y
-CONFIG_MODPROBE=y
+CONFIG_MODINFO=n
+CONFIG_MODPROBE=n
 # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-CONFIG_RMMOD=y
+CONFIG_RMMOD=n
 
 #
 # Options common to multiple modutils
 #
-CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y
+CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=n
 # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
 # CONFIG_FEATURE_2_4_MODULES is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
@@ -579,8 +579,8 @@ CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
 # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_FEATURE_MODUTILS_ALIAS=n
+CONFIG_FEATURE_MODUTILS_SYMBOLS=n
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 
@@ -864,7 +864,7 @@ CONFIG_FTPPUT=y
 CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
 CONFIG_HOSTNAME=y
 # CONFIG_DNSDOMAINNAME is not set
-CONFIG_HTTPD=y
+CONFIG_HTTPD=n
 CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -1015,12 +1015,12 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
 #
 # Mail Utilities
 #
-CONFIG_MAKEMIME=y
-CONFIG_POPMAILDIR=y
+CONFIG_MAKEMIME=n
+CONFIG_POPMAILDIR=n
 CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
-CONFIG_REFORMIME=y
+CONFIG_REFORMIME=n
 CONFIG_FEATURE_REFORMIME_COMPAT=y
-CONFIG_SENDMAIL=y
+CONFIG_SENDMAIL=n
 CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 
 #

diff --git a/busybox/sources b/busybox/sources
index 1839da23762418330f8d23f9a132711be4b46264..ddbb909bbb88bb5717de3c6851c8306893799d31 100644 (file)
--- a/busybox/sources
+++ b/busybox/sources
@@ -1,7 +1,6 @@
 https://git.busybox.net/busybox/snapshot/busybox-1_33_1.tar.gz
 files/config
 files/config-suid
-files/acpid.run
 files/crond.run
 files/mdev.conf
 files/mdev.run

diff --git a/busybox/version b/busybox/version
index 0be643dad2a8996873097431efb3b026c0d7c3ce..d991ae9266bf962c0cb6152641252bc900147a8e 100644 (file)
--- a/busybox/version
+++ b/busybox/version
@@ -1 +1 @@
-1.33.1 3
+1.33.1 4