From 827c97f0ca2bbb2c94d49187b96f83e3e3ed670a Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 20 Nov 2020 19:35:20 +0100 Subject: [PATCH] Make sure ALSA modprobe parameters get applied (#1007) * Remove busybox Linux module support Since systemd relies on the upstream Linux kernel module handling utility "kmod" the busybox implementations are not required. Already today the official "kmod" utility takes precedence: haos # ls -la /usr/sbin/*mod* lrwxrwxrwx 1 root root 11 Nov 11 11:32 /usr/sbin/depmod -> ../bin/kmod lrwxrwxrwx 1 root root 11 Nov 11 11:32 /usr/sbin/insmod -> ../bin/kmod lrwxrwxrwx 1 root root 11 Nov 11 11:32 /usr/sbin/lsmod -> ../bin/kmod lrwxrwxrwx 1 root root 11 Nov 11 11:32 /usr/sbin/modinfo -> ../bin/kmod lrwxrwxrwx 1 root root 11 Nov 11 11:32 /usr/sbin/modprobe -> ../bin/kmod lrwxrwxrwx 1 root root 11 Nov 11 11:32 /usr/sbin/rmmod -> ../bin/kmod * Move modprobe configuration alsa-base.conf to correct location The official modprobe package from kmod checks three locations: /etc/modprobe.d/, /lib/modprobe.d/ and /run/modprobe.d/. Since usr-move /lib is a symlink to /usr/lib, the correct location for distribution provided modprobe files is /usr/lib/modprobe.d. --- buildroot-external/busybox.config | 27 ++++++++++++------- .../usr/{ => lib}/modprobe.d/alsa-base.conf | 0 2 files changed, 17 insertions(+), 10 deletions(-) rename buildroot-external/rootfs-overlay/usr/{ => lib}/modprobe.d/alsa-base.conf (100%) diff --git a/buildroot-external/busybox.config b/buildroot-external/busybox.config index 344744812..55f569b22 100644 --- a/buildroot-external/busybox.config +++ b/buildroot-external/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.31.1 -# Fri Apr 17 12:18:50 2020 +# Busybox version: 1.32.0 +# Fri Nov 20 14:15:29 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -462,6 +463,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 # CONFIG_FEATURE_FIND_PRUNE is not set # CONFIG_FEATURE_FIND_QUIT is not set # CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_EMPTY is not set # CONFIG_FEATURE_FIND_PATH is not set # CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -556,12 +558,12 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_MODPROBE_SMALL is not set # CONFIG_DEPMOD is not set # CONFIG_INSMOD is not set -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODINFO=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y -CONFIG_RMMOD=y +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODINFO is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_RMMOD is not set # # Options common to multiple modutils @@ -578,8 +580,8 @@ CONFIG_RMMOD=y # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set # CONFIG_FEATURE_MODUTILS_ALIAS is not set # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities @@ -692,6 +694,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y CONFIG_SWITCH_ROOT=y CONFIG_TASKSET=y CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_FEATURE_TASKSET_CPULIST=y CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -809,6 +812,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set # CONFIG_MICROCOM is not set +CONFIG_MIM=y # CONFIG_MT is not set CONFIG_NANDWRITE=y CONFIG_NANDDUMP=y @@ -1095,6 +1099,7 @@ CONFIG_SH_IS_ASH=y CONFIG_BASH_IS_ASH=y # CONFIG_BASH_IS_HUSH is not set # CONFIG_BASH_IS_NONE is not set +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y @@ -1115,6 +1120,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_LINENO_VAR is not set @@ -1177,6 +1183,7 @@ CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set # CONFIG_FEATURE_SYSLOGD_CFG is not set +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/buildroot-external/rootfs-overlay/usr/modprobe.d/alsa-base.conf b/buildroot-external/rootfs-overlay/usr/lib/modprobe.d/alsa-base.conf similarity index 100% rename from buildroot-external/rootfs-overlay/usr/modprobe.d/alsa-base.conf rename to buildroot-external/rootfs-overlay/usr/lib/modprobe.d/alsa-base.conf