Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysinfo: improve script to avoid errors on platforms without some variables 

This commit improves the sysinfo script to skip error on platforms that don't
provide some variables.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2022-10-18 16:39:21 +02:00
parent d4544a7f43
commit 3e0d713837
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo
View File

@ -293,10 +293,15 @@ if [ -z "${UBOOT_VERSION}" ]; then
UBOOT_VERSION="$(strings ${UBOOT_PARTITION} | grep -m 1 dub | cut -d' ' -f2)" UBOOT_VERSION="$(strings ${UBOOT_PARTITION} | grep -m 1 dub | cut -d' ' -f2)"
fi fi
MACHINE="$(cat /proc/device-tree/compatible | tr '\0' '\t' | cut -f 1)" MACHINE="$(cat /proc/device-tree/compatible | tr '\0' '\t' | cut -f 1)"
if grep -qs 'DVK' /proc/device-tree/model; then
BOARD_TYPE="DVK"
else
BOARD_TYPE="SBC"
fi
BOARD_VARIANT="$(cat /proc/device-tree/digi,hwid,variant | tr -d '\0')" BOARD_VARIANT="$(cat /proc/device-tree/digi,hwid,variant | tr -d '\0')"
BOARD_SN="$(cat /proc/device-tree/digi,hwid,sn | tr -d '\0')" BOARD_SN="$(cat /proc/device-tree/digi,hwid,sn | tr -d '\0')"
BOARD_VERSION="$(cat /proc/device-tree/digi,carrierboard,version | tr -d '\0')" BOARD_VERSION="$(cat /proc/device-tree/digi,carrierboard,version | tr -d '\0')"
BOARD_ID="$(cat /proc/device-tree/digi,carrierboard,id | tr -d '\0')" [ -e "/proc/device-tree/digi,carrierboard,id" ] && BOARD_ID="$(cat /proc/device-tree/digi,carrierboard,id | tr -d '\0')"
[ -e "/proc/device-tree/cpus/rev" ] && SOC_REV="$(cat /proc/device-tree/cpus/rev | tr -d '\0')" [ -e "/proc/device-tree/cpus/rev" ] && SOC_REV="$(cat /proc/device-tree/cpus/rev | tr -d '\0')"
if grep -qs '\<digi,ccimx6ul\>' /proc/device-tree/compatible; then if grep -qs '\<digi,ccimx6ul\>' /proc/device-tree/compatible; then
@ -329,11 +334,14 @@ REPORT_PATH="/tmp/sysinfo-${DEY_VERSION}-${BOARD_SN}-${DATE}"
echo "" echo ""
echo "||*Component*||*Version*" echo "||*Component*||*Version*"
if [ -n "$SOC_REV" ]; then DUT_HEADER="SN-${BOARD_SN}, ${MACHINE} ${BOARD_VARIANT} ${BOARD_TYPE}v${BOARD_VERSION}"
echo "|| DUT | SN-${BOARD_SN}, ${MACHINE} ${BOARD_VARIANT} SBCv${BOARD_VERSION} board_ID=${BOARD_ID} SOC_REV=${SOC_REV}." if [ -n "${BOARD_ID}" ]; then
else DUT_HEADER="${DUT_HEADER} board_ID=${BOARD_ID}"
echo "|| DUT | SN-${BOARD_SN}, ${MACHINE} ${BOARD_VARIANT} SBCv${BOARD_VERSION} board_ID=${BOARD_ID}."
fi fi
if [ -n "${SOC_REV}" ]; then
DUT_HEADER="${DUT_HEADER} SOC_REV=${SOC_REV}"
fi
echo "|| DUT | ${DUT_HEADER}"
echo "|| U-Boot | ${UBOOT_VERSION}" echo "|| U-Boot | ${UBOOT_VERSION}"
echo "|| Firmware | ${DISTRO}-${DEY_VERSION}-$(cat /etc/version)" echo "|| Firmware | ${DISTRO}-${DEY_VERSION}-$(cat /etc/version)"
echo "|| Kernel | $(uname -a)" echo "|| Kernel | $(uname -a)"