repository

Carbs Linux repositories
git clone git://git.carbslinux.org/repository
Log | Files | Refs | README | LICENSE

commit c8229a18fdc53b494ffd2843d9966a2c17ec6bf9
parent e32e8b0eda475029848104854cd8d10688fc07ec
Author: Cem Keylan <cem@ckyln.com>
Date:   Mon, 17 Feb 2020 14:36:19 +0300

busybox: add back acpid, show usage information on busybox-suid

Diffstat:
Mcore/busybox/build | 2++
Mcore/busybox/checksums | 5+++--
Mcore/busybox/files/.config | 6+++---
Mcore/busybox/files/.config-suid | 14+++++++-------
Acore/busybox/files/acpid.run | 2++
Mcore/busybox/sources | 1+
6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/core/busybox/build b/core/busybox/build @@ -35,9 +35,11 @@ chmod u+s "$1/usr/bin/busybox-suid" install -Dm755 crond.run "$1/etc/sv/crond/run" install -Dm755 ntpd.run "$1/etc/sv/ntpd/run" install -Dm755 syslogd.run "$1/etc/sv/syslogd/run" +install -Dm755 acpid.run "$1/etc/sv/acpid/run" ln -s /run/runit/supervise.crond "$1/etc/sv/crond/supervise" ln -s /run/runit/supervise.ntpd "$1/etc/sv/ntpd/supervise" ln -s /run/runit/supervise.syslogd "$1/etc/sv/syslogd/supervise" +ln -s /run/runit/supervise.acpid "$1/etc/sv/acpid/supervise" # Install ntp config install -Dm644 ntp.conf "$1/etc/ntp.conf" diff --git a/core/busybox/checksums b/core/busybox/checksums @@ -1,6 +1,7 @@ d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 busybox-1.31.1.tar.bz2 -16346979ace9db5fc1e3f22c0206c354ac117ed46390f63ea81b9bd0c6fe9f0b .config -da3ef90a65abcbd112fa98a00799745d88d568cde290e049a5380dfc74de620a .config-suid +2384cd794cd641dadbade052273d4cecbec15d562434f7d84b8efc2628f491a2 .config +1e802166c267f87b4fa0fbb00231fda211467675ffd5acdc5649be2030d19d5f .config-suid +ebd61afac770d3d9cae5c411f44002496fb18b28cf7b77520072a3909852246e acpid.run 814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12 crond.run fc36020a1043587fc45427d02dea356c9c892571baabe2b50ce328aaab5f6400 ntpd.run 4a5981f4b0d791fe9b84b0b2e01ae905f6565c8245b3cd603e6decf34ddad71a syslogd.run diff --git 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 -# Mon Jan 20 23:44:37 2020 +# Mon Feb 17 14:29:36 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -584,8 +584,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities # -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y # CONFIG_BLKDISCARD is not set # CONFIG_BLKID is not set # CONFIG_FEATURE_BLKID_TYPE is not set diff --git a/core/busybox/files/.config-suid b/core/busybox/files/.config-suid @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.31.0 -# Wed Sep 18 12:37:29 2019 +# Busybox version: 1.31.1 +# Mon Feb 17 14:27:32 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -12,10 +12,10 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_EXTRA_COMPAT is not set # CONFIG_FEDORA_COMPAT is not set # CONFIG_INCLUDE_SUSv2 is not set -# CONFIG_LONG_OPTS is not set -# CONFIG_SHOW_USAGE is not set -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_COMPRESS_USAGE is not set +CONFIG_LONG_OPTS=y +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y # CONFIG_LFS is not set # CONFIG_PAM is not set # CONFIG_FEATURE_DEVPTS is not set @@ -42,7 +42,7 @@ CONFIG_PLATFORM_LINUX=y # Build Options # CONFIG_STATIC=y -CONFIG_PIE=y +# CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set diff --git a/core/busybox/files/acpid.run b/core/busybox/files/acpid.run @@ -0,0 +1,2 @@ +#!/bin/sh +exec acpid -f diff --git a/core/busybox/sources b/core/busybox/sources @@ -1,6 +1,7 @@ https://busybox.net/downloads/busybox-1.31.1.tar.bz2 files/.config files/.config-suid +files/acpid.run files/crond.run files/ntpd.run files/syslogd.run