[alsa-devel] [PATCH 1/4] utils/alsa-info.sh: adding system firmware version to the defaults collected under "DMI Information"
From: Chris Van Hoof vanhoof@canonical.com
Signed-off-by: Chris Van Hoof vanhoof@canonical.com Signed-off-by: David Henningsson david.henningsson@canonical.com --- utils/alsa-info.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh index fd7df96..46d2ebb 100755 --- a/utils/alsa-info.sh +++ b/utils/alsa-info.sh @@ -424,10 +424,12 @@ if [ -d /sys/class/dmi/id ]; then DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null) DMI_SYSTEM_PRODUCT_VERSION=$(cat /sys/class/dmi/id/product_version 2>/dev/null) + DMI_SYSTEM_FIRMWARE_VERSION=$(cat /sys/class/dmi/id/bios_version 2>/dev/null) elif [ -x $DMIDECODE ]; then DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null) DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null) DMI_SYSTEM_PRODUCT_VERSION=$($DMIDECODE -s system-version 2>/dev/null) + DMI_SYSTEM_FIRMWARE_VERSION=$($DMIDECODE -s bios-version 2>/dev/null) fi
cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp @@ -469,6 +471,7 @@ echo "" >> $FILE echo "Manufacturer: $DMI_SYSTEM_MANUFACTURER" >> $FILE echo "Product Name: $DMI_SYSTEM_PRODUCT_NAME" >> $FILE echo "Product Version: $DMI_SYSTEM_PRODUCT_VERSION" >> $FILE +echo "Firmware Version: $DMI_SYSTEM_FIRMWARE_VERSION" >> $FILE echo "" >> $FILE echo "" >> $FILE echo "!!Kernel Information" >> $FILE
The number of ---- should match the corresponding headers.
Signed-off-by: David Henningsson david.henningsson@canonical.com --- utils/alsa-info.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh index 46d2ebb..01429a5 100755 --- a/utils/alsa-info.sh +++ b/utils/alsa-info.sh @@ -111,7 +111,7 @@ cleanup() {
withaplay() { echo "!!Aplay/Arecord output" >> $FILE - echo "!!------------" >> $FILE + echo "!!--------------------" >> $FILE echo "" >> $FILE echo "APLAY" >> $FILE echo "" >> $FILE @@ -149,7 +149,7 @@ withamixer() {
withalsactl() { echo "!!Alsactl output" >> $FILE - echo "!!-------------" >> $FILE + echo "!!--------------" >> $FILE echo "" >> $FILE exe="" if [ -x /usr/sbin/alsactl ]; then @@ -244,7 +244,7 @@ withsysfs() {
withdmesg() { echo "!!ALSA/HDA dmesg" >> $FILE - echo "!!------------------" >> $FILE + echo "!!--------------" >> $FILE echo "" >> $FILE dmesg | grep -C1 -E 'ALSA|HDA|HDMI|sound|hda.codec|hda.intel' >> $FILE echo "" >> $FILE @@ -547,7 +547,7 @@ cat $TEMPDIR/lspci.tmp >> $FILE echo "" >> $FILE echo "" >> $FILE echo "!!Advanced information - PCI Vendor/Device/Subsystem ID's" >> $FILE -echo "!!--------------------------------------------------------" >> $FILE +echo "!!-------------------------------------------------------" >> $FILE echo "" >> $FILE lspci -vvn |grep -A1 040[1-3] >> $FILE echo "" >> $FILE @@ -566,7 +566,7 @@ fi if [ -d "$SYSFS" ] then echo "!!Loaded sound module options" >> $FILE -echo "!!--------------------------" >> $FILE +echo "!!---------------------------" >> $FILE echo "" >> $FILE for mod in `cat /proc/asound/modules|awk {'print $2'}`;do echo "!!Module: $mod" >> $FILE @@ -594,7 +594,7 @@ fi if [ -s "$TEMPDIR/alsa-ac97.tmp" ] then echo "!!AC97 Codec information" >> $FILE - echo "!!---------------------------" >> $FILE + echo "!!----------------------" >> $FILE echo "--startcollapse--" >> $FILE echo "" >> $FILE cat $TEMPDIR/alsa-ac97.tmp >> $FILE @@ -608,7 +608,7 @@ fi if [ -s "$TEMPDIR/alsa-usbmixer.tmp" ] then echo "!!USB Mixer information" >> $FILE - echo "!!---------------------------" >> $FILE + echo "!!---------------------" >> $FILE echo "--startcollapse--" >> $FILE echo "" >> $FILE cat $TEMPDIR/alsa-usbmixer.tmp >> $FILE
Signed-off-by: David Henningsson david.henningsson@canonical.com --- utils/alsa-info.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh index 01429a5..8f67e3c 100755 --- a/utils/alsa-info.sh +++ b/utils/alsa-info.sh @@ -416,6 +416,7 @@ ESDINST=$(which esd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) PAINST=$(which pulseaudio 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) +ROARINST=$(which roard 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
#Check for DMI data @@ -529,7 +530,14 @@ echo " Installed - Yes ($JACKINST)" >> $FILE echo " Running - $JACKRUNNING" >> $FILE echo "" >> $FILE fi -if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" ]];then +if [[ -n $ROARINST ]];then +[[ `pgrep '^(.*/)?roard$'` ]] && ROARRUNNING="Yes" || ROARRUNNING="No" +echo "RoarAudio:" >> $FILE +echo " Installed - Yes ($ROARINST)" >> $FILE +echo " Running - $ROARRUNNING" >> $FILE +echo "" >> $FILE +fi +if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" && -z "$ROARINST" ]];then echo "No sound servers found." >> $FILE echo "" >> $FILE fi
Signed-off-by: David Henningsson david.henningsson@canonical.com --- utils/alsa-info.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh index 8f67e3c..721ab41 100755 --- a/utils/alsa-info.sh +++ b/utils/alsa-info.sh @@ -1,6 +1,6 @@ #!/bin/bash
-SCRIPT_VERSION=0.4.60 +SCRIPT_VERSION=0.4.61 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
#################################################################################
At Mon, 11 Jun 2012 10:45:20 +0200, David Henningsson wrote:
From: Chris Van Hoof vanhoof@canonical.com
Signed-off-by: Chris Van Hoof vanhoof@canonical.com Signed-off-by: David Henningsson david.henningsson@canonical.com
Thanks, applied all 4 patches now.
Takashi
utils/alsa-info.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh index fd7df96..46d2ebb 100755 --- a/utils/alsa-info.sh +++ b/utils/alsa-info.sh @@ -424,10 +424,12 @@ if [ -d /sys/class/dmi/id ]; then DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null) DMI_SYSTEM_PRODUCT_VERSION=$(cat /sys/class/dmi/id/product_version 2>/dev/null)
- DMI_SYSTEM_FIRMWARE_VERSION=$(cat /sys/class/dmi/id/bios_version 2>/dev/null)
elif [ -x $DMIDECODE ]; then DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null) DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null) DMI_SYSTEM_PRODUCT_VERSION=$($DMIDECODE -s system-version 2>/dev/null)
- DMI_SYSTEM_FIRMWARE_VERSION=$($DMIDECODE -s bios-version 2>/dev/null)
fi
cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp @@ -469,6 +471,7 @@ echo "" >> $FILE echo "Manufacturer: $DMI_SYSTEM_MANUFACTURER" >> $FILE echo "Product Name: $DMI_SYSTEM_PRODUCT_NAME" >> $FILE echo "Product Version: $DMI_SYSTEM_PRODUCT_VERSION" >> $FILE +echo "Firmware Version: $DMI_SYSTEM_FIRMWARE_VERSION" >> $FILE echo "" >> $FILE echo "" >> $FILE echo "!!Kernel Information" >> $FILE -- 1.7.9.5
participants (2)
-
David Henningsson -
Takashi Iwai