forked from pool/alsa-utils
Takashi Iwai
7200ea9d85
- Backport upstream patches: A few portability fixes, alsaucm fixes and extensions, alsatplg minor fixes, alsa-info.sh extensions: 0001-treewide-sys-poll-to-poll.patch 0002-treewide-Fix-wrong-formats-on-32-bit.patch 0003-treewide-Fix-printf-formats.patch 0004-aplay-Adjust-buffer-sizes-to-fix-snprintf-warnings.patch 0005-aplay-Limit-VUMeter-progress-bar-to-100-for-negative.patch 0006-alsactl-sysfs-add-sys-kernel-uevent_seqnum-check-to-.patch 0007-alsaucm-use-the-first-sound-card-use-case-name-hw-CA.patch 0008-alsaucm-add-text-dump-command.patch 0009-alsaucm-add-json-dump-command.patch 0010-alsaucm-dump-fix-the-prefixed.patch 0011-alsactl-fix-sched-idle-set-it-really-to-SCHED_IDLE.patch 0012-configure-Fix-linking-of-alsatplg-with-the-older-lib.patch 0013-alsatplg-add-n-normalize-option.patch 0014-alsatplg-add-s-sort-and-fix-memory-leaks.patch 0015-alsatplg-fix-another-small-leak-in-normalize_config.patch 0016-alsa-info.sh-Consolidate-PCI-device-output.patch 0017-alsa-info.sh-Read-from-proc-modules-and-sort-the-res.patch 0018-alsa-info.sh-Simplify-iteration-over-cards-when-call.patch 0019-alsa-info.sh-Use-existing-function-to-print-ALSA-con.patch 0020-alsa-info.sh-Exit-script-after-writing-information-t.patch 0021-alsa-info.sh-Replace-gauge-with-infobox-for-upload-d.patch 0022-alsa-info.sh-Remove-progress-spinner-during-upload-w.patch 0023-alsa-info.sh-Condense-nested-commands-for-file-uploa.patch 0024-alsa-info.sh-Condense-nested-commands-for-formatting.patch 0025-alsa-info.sh-Perform-test-for-wget-earlier.patch 0026-alsa-info.sh-Warn-after-actual-upload-failure-do-not.patch OBS-URL: https://build.opensuse.org/request/show/766332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=165
70 lines
2.0 KiB
Diff
70 lines
2.0 KiB
Diff
From 86b1f80e24b68ce8153874e6ac851fa2b90c43b5 Mon Sep 17 00:00:00 2001
|
|
From: David Ward <david.ward@ll.mit.edu>
|
|
Date: Sat, 21 Dec 2019 00:32:02 -0500
|
|
Subject: [PATCH 17/26] alsa-info.sh: Read from /proc/modules and sort the
|
|
result
|
|
|
|
Sorting the list of loaded modules makes it much easier to compare
|
|
two alsa-info.txt files, even if they are both from the same system
|
|
(since the order actually changes after each reboot).
|
|
|
|
lsmod just formats the contents of /proc/modules. After this script
|
|
calls lsmod, it strips everything but module names from the output.
|
|
This same result can be obtained just as easily by reading directly
|
|
from /proc/modules; then there is no need to remove the header line
|
|
printed by lsmod before sorting the output.
|
|
|
|
Signed-off-by: David Ward <david.ward@ll.mit.edu>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
alsa-info/alsa-info.sh | 9 ++++-----
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh
|
|
index 8fc69972f9f3..ed1d9e248405 100755
|
|
--- a/alsa-info/alsa-info.sh
|
|
+++ b/alsa-info/alsa-info.sh
|
|
@@ -35,7 +35,7 @@ BGTITLE="ALSA-Info v $SCRIPT_VERSION"
|
|
PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0pHsuc"
|
|
|
|
WGET=$(which wget 2>/dev/null | sed 's|^[^/]*||' 2>/dev/null)
|
|
-REQUIRES="mktemp grep pgrep whereis ping awk date uname cat dmesg amixer alsactl"
|
|
+REQUIRES="mktemp grep pgrep whereis ping awk date uname cat sort dmesg amixer alsactl"
|
|
|
|
#
|
|
# Define some simple functions
|
|
@@ -131,11 +131,11 @@ withaplay() {
|
|
echo "" >> $FILE
|
|
}
|
|
|
|
-withlsmod() {
|
|
+withmodules() {
|
|
echo "!!All Loaded Modules" >> $FILE
|
|
echo "!!------------------" >> $FILE
|
|
echo "" >> $FILE
|
|
- lsmod | awk '{print $1}' >> $FILE
|
|
+ awk '{print $1}' < /proc/modules | sort >> $FILE
|
|
echo "" >> $FILE
|
|
echo "" >> $FILE
|
|
}
|
|
@@ -254,7 +254,7 @@ withall() {
|
|
withaplay
|
|
withamixer
|
|
withalsactl
|
|
- withlsmod
|
|
+ withmodules
|
|
withsysfs
|
|
withdmesg
|
|
WITHALL="no"
|
|
@@ -366,7 +366,6 @@ information about your ALSA installation and sound related hardware.
|
|
|
|
dmesg
|
|
lspci
|
|
- lsmod
|
|
aplay
|
|
amixer
|
|
alsactl
|
|
--
|
|
2.16.4
|
|
|