diff options
| -rwxr-xr-x | core/busybox/build | 23 | ||||
| -rw-r--r-- | core/busybox/checksums | 4 | ||||
| -rw-r--r-- | core/busybox/files/.config | 26 | ||||
| -rw-r--r-- | core/busybox/files/mdev.conf | 58 | ||||
| -rw-r--r-- | core/busybox/files/mdev.run | 3 | ||||
| -rw-r--r-- | core/busybox/sources | 2 |
6 files changed, 93 insertions, 23 deletions
diff --git a/core/busybox/build b/core/busybox/build index af6445af..568836ed 100755 --- a/core/busybox/build +++ b/core/busybox/build @@ -1,5 +1,11 @@ #!/bin/sh -e +kinstall() { + # usage: kisntall 755 filename /usr/bin/file + mkdir -p "${3%/*}"; cp "$2" "$3" + chmod "$1" "$3" +} + for patch in *.patch; do patch -p1 < "$patch" done @@ -35,15 +41,14 @@ done # Set suid on busybox suid. chmod u+s "$1/usr/bin/busybox-suid" -# Install runit and sysmgr services -for service in crond.run ntpd.run syslogd.run acpid.run ; do - install -Dm755 "$service" "$1/etc/sv/${service%.*}/run" - install -Dm755 "$service" "$1/etc/sysmgr/${service%.*}" +# Install runit and sysmgr services. +for service in crond.run mdev.run ntpd.run syslogd.run acpid.run ; do + kinstall 755 "$service" "$1/etc/sv/${service%.*}/run" + kinstall 755 "$service" "$1/etc/sysmgr/${service%.*}" ln -s /run/runit/supervise.${service%.*} "$1/etc/sv/${service%.*}/supervise" done -# Install ntp config -install -Dm644 ntp.conf "$1/etc/ntp.conf" - -# Install inittab -install -Dm644 inittab "$1/etc/inittab" +# Install configurations for ntp, init, and mdev. +kinstall 644 ntp.conf "$1/etc/ntp.conf" +kinstall 644 inittab "$1/etc/inittab" +kinstall 644 mdev.conf "$1/etc/mdev.conf" diff --git a/core/busybox/checksums b/core/busybox/checksums index 88535c5f..fede3dcd 100644 --- a/core/busybox/checksums +++ b/core/busybox/checksums @@ -1,9 +1,11 @@ d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 busybox-1.31.1.tar.bz2 -8f13a63a077f8f781faad2c4476d629be4df15167f1f890737f9936ddb9ae9b3 .config +ccb775673d9315174b353e137a5362e5446f6593a4bb2b622c22b1e41c219ed8 .config 47473c15263d52cc741993ca0386d0042a719b23c89e406e173510e42e0f23a5 .config-suid ebd61afac770d3d9cae5c411f44002496fb18b28cf7b77520072a3909852246e acpid.run 814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12 crond.run c8b3502bf493336542247683f8d291753130141e5b20ecfda7077936751e83a7 inittab +af4c302ed9ae6fa1cd8aa51c6f94de11550625e6f1dc0b138605e3429214d082 mdev.conf +224d522c70c349cf656994e4d7f9a34cbe3ece7da253357828649d1187601436 mdev.run 3999bb8986a55b14389196ad70f810c9333ebdf5e03c0fbca2d100a6e8ba3d7e ntpd.run 4a5981f4b0d791fe9b84b0b2e01ae905f6565c8245b3cd603e6decf34ddad71a syslogd.run 2c6012579f669ea790785bb522a879a2005aad0d7977f96863918d3ed3cb03dd ntp.conf diff --git a/core/busybox/files/.config b/core/busybox/files/.config index 6089be49..87c7b94f 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 -# Wed May 20 11:42:39 2020 +# Mon Jun 1 11:10:36 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -158,9 +158,9 @@ CONFIG_FEATURE_SEAMLESS_Z=y # CONFIG_BZIP2 is not set CONFIG_BZIP2_SMALL=0 # CONFIG_FEATURE_BZIP2_DECOMPRESS is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_GZIP is not set @@ -611,7 +611,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FEATURE_OSF_LABEL is not set # CONFIG_FEATURE_GPT_LABEL is not set # CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set +CONFIG_FINDFS=y # CONFIG_FLOCK is not set # CONFIG_FDFLUSH is not set # CONFIG_FREERAMDISK is not set @@ -634,13 +634,13 @@ CONFIG_FEATURE_GETOPT_LONG=y # CONFIG_LOSETUP is not set CONFIG_LSPCI=y CONFIG_LSUSB=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -# CONFIG_FEATURE_MDEV_DAEMON is not set +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_FEATURE_MDEV_DAEMON=y # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # CONFIG_MKE2FS is not set @@ -689,7 +689,7 @@ CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y CONFIG_SWAPOFF=y CONFIG_FEATURE_SWAPONOFF_LABEL=y -# CONFIG_SWITCH_ROOT is not set +CONFIG_SWITCH_ROOT=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_UEVENT is not set diff --git a/core/busybox/files/mdev.conf b/core/busybox/files/mdev.conf new file mode 100644 index 00000000..8edbd89c --- /dev/null +++ b/core/busybox/files/mdev.conf @@ -0,0 +1,58 @@ +# +# /etc/mdev.conf +# + +# sample mdev_fat.conf with minor modifications. The original +# can be found on examples/mdev_fat.conf which provides more +# information regarding syntax and usage. +# +# see also the usage output for 'mdev --help' for more information. + +# support module loading on hotplug +$MODALIAS=.* root:root 660 @modprobe "$MODALIAS" + +# general-purpose devices +null root:root 666 @chmod 666 $MDEV +zero root:root 666 +full root:root 666 +random root:root 444 +urandom root:root 444 +hwrandom root:root 444 +grsec root:root 660 + +kmem root:root 640 +mem root:root 640 +port root:root 640 + +# tty devices +console root:tty 600 @chmod 600 $MDEV +ptmx root:tty 666 +pty.* root:tty 660 + +tty root:tty 666 +tty[0-9]* root:tty 660 +vcsa*[0-9]* root:tty 660 +ttyS[0-9]* root:uucp 660 + +# audio devices +adsp root:audio 660 >sound/ +audio root:audio 660 >sound/ +dsp root:audio 660 >sound/ +mixer root:audio 660 >sound/ +sequencer.* root:audio 660 >sound/ +snd/.* root:audio 660 + +# video devices +card[0-9] root:video 660 =dri/ +dri/.* root:video 660 + +# misc stuff +agpgart root:root 660 >misc/ +psaux root:root 660 >misc/ +rtc root:root 664 >misc/ + +# input stuff +event[0-9]+ root:root 640 =input/ +mice root:root 640 =input/ +mouse[0-9] root:root 640 =input/ +ts[0-9] root:root 640 =input/ diff --git a/core/busybox/files/mdev.run b/core/busybox/files/mdev.run new file mode 100644 index 00000000..12b10b5d --- /dev/null +++ b/core/busybox/files/mdev.run @@ -0,0 +1,3 @@ +#!/bin/sh + +exec mdev -df diff --git a/core/busybox/sources b/core/busybox/sources index 8733fc8f..435b330b 100644 --- a/core/busybox/sources +++ b/core/busybox/sources @@ -4,6 +4,8 @@ files/.config-suid files/acpid.run files/crond.run files/inittab +files/mdev.conf +files/mdev.run files/ntpd.run files/syslogd.run files/ntp.conf |