From a3bbd8a56f3d987b619803038fdeb87bf8a91370 Mon Sep 17 00:00:00 2001 From: David Escalona Date: Mon, 5 Jun 2023 14:11:12 +0200 Subject: [PATCH] meta-digi-dey: sysinfo: include the new firmware version variable in the 'sysinfo' report While on it, rename the old "Firmware" variable to "DEY version", as it refers explicity to the DEY distribution version. https://onedigi.atlassian.net/browse/DEL-8539 Signed-off-by: David Escalona --- meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo index 241ddb4f8..670ce3958 100755 --- a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo +++ b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo @@ -3,7 +3,7 @@ # # sysinfo # -# Copyright (C) 2016-2020 by Digi International Inc. +# Copyright (C) 2016-2023 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -27,6 +27,15 @@ make_report(){ uptime printf "\n\n" + echo "--------------------------------------" + echo "- -" + echo "- Firmware version -" + echo "- -" + echo "--------------------------------------" + echo "" + sed -n 's/^firmware \(.*\)/\1/p' < /etc/sw-versions + printf "\n\n" + echo "--------------------------------------" echo "- -" echo "- Kernel version -" @@ -343,7 +352,8 @@ REPORT_PATH="/tmp/sysinfo-${DEY_VERSION}-${BOARD_SN}-${DATE}" fi echo "|| DUT | ${DUT_HEADER}" echo "|| U-Boot | ${UBOOT_VERSION}" - echo "|| Firmware | ${DISTRO}-${DEY_VERSION}-$(cat /etc/version)" + echo "|| Firmware version | $(sed -n 's/^firmware \(.*\)/\1/p' < /etc/sw-versions)" + echo "|| DEY version | ${DISTRO}-${DEY_VERSION}-$(cat /etc/version)" echo "|| Kernel | $(uname -a)" echo "|| meta-digi | $(sed -ne '/^meta-digi-dey/s,.*= \(.*\)$,\1,g;T;p' /etc/build)" [ -n "${MCA_VERSION}" ] && echo "|| MCA | ${MCA_VERSION}"