diff --git a/core/busybox/build b/core/busybox/build index 3e3fa98d..a32a46cd 100755 --- a/core/busybox/build +++ b/core/busybox/build @@ -29,19 +29,7 @@ done done # Set suid on busybox suid. -chmod +s "$1/usr/bin/busybox-suid" - -# Build and install a statically compiled busybox. -# This is useful for instances where the system is broken -# and for making an initramfs. -# -# The sleep is required so that 'make' doesn't skip the -# changes due to its 'mtime' checks. -make defconfig -sleep 1 -sed -i'' "s/.*CONFIG_STATIC.*/CONFIG_STATIC=y/" .config -make -install -Dm755 busybox "$1/usr/lib/busybox" +chmod u+s "$1/usr/bin/busybox-suid" # Install runit services. install -Dm755 acpid.run "$1/etc/sv/acpid/run" diff --git a/core/busybox/checksums b/core/busybox/checksums index 296d761f..c81d55c2 100644 --- a/core/busybox/checksums +++ b/core/busybox/checksums @@ -1,6 +1,6 @@ 0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99 busybox-1.31.0.tar.bz2 -3b53ef4e04527a511f84342620f5689bb5ce890acab710f0f00b44772589fd29 .config -70503f9a0ab3d6be4bd2383ef92a28329140926ecdd83b9d8b3a2e09100cc083 .config-suid +83a2d417b9d866b62752b73b20547ef911f65a6ac484b7194df5c2a49ea08072 .config +f6dc3d467bd4ee178d92595ca1c8a58288ce8292a14a8381534aa9445acd0858 .config-suid 6c3eb5cf839c7a31c337df0cd8388b397e1415ffa7a63e9678552c9c63dd869f acpid.run 814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12 crond.run 4a5981f4b0d791fe9b84b0b2e01ae905f6565c8245b3cd603e6decf34ddad71a syslogd.run diff --git a/core/busybox/files/.config b/core/busybox/files/.config index 4e24f54b..b05402b7 100644 --- a/core/busybox/files/.config +++ b/core/busybox/files/.config @@ -41,7 +41,7 @@ CONFIG_PLATFORM_LINUX=y # # Build Options # -# CONFIG_STATIC is not set +CONFIG_STATIC=y CONFIG_PIE=y # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set diff --git a/core/busybox/files/.config-suid b/core/busybox/files/.config-suid index c0bd9eab..5cce4e69 100644 --- a/core/busybox/files/.config-suid +++ b/core/busybox/files/.config-suid @@ -41,8 +41,8 @@ CONFIG_FEATURE_SYSLOG=y # # Build Options # -# CONFIG_STATIC is not set -# CONFIG_PIE is not set +CONFIG_STATIC=y +CONFIG_PIE=y # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set diff --git a/core/busybox/version b/core/busybox/version index 35b616c1..d63b9be1 100644 --- a/core/busybox/version +++ b/core/busybox/version @@ -1 +1 @@ -1.31.0 3 +1.31.0 4