From 7dda6380c24ba90e70de6802b5e80c772f95f82f Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 28 Jun 2016 12:37:51 +0200 Subject: [PATCH] meta-digi-dey: sysinfo: Use DISTRO and machine name. The following utilities are supposed to be available on the environment's PATH: uptime, uname, cat, zcat, free, ps, mount, netstat, route, ifconfig, gzip https://jira.digi.com/browse/DEL-2447 Signed-off-by: Alex Gonzalez --- meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo index 8b0f2b9d7..a9b5c565c 100755 --- a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo +++ b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo @@ -182,8 +182,10 @@ make_report(){ } +DISTRO="$(sed -ne 's,DISTRO = \(.*\)$,\1,g;T;p' /etc/build)" DEY_VERSION="$(sed -ne 's,DISTRO_VERSION = \(.*\)$,\1,g;T;p' /etc/build)" UBOOT_VERSION="$(strings /dev/mmcblk0boot0 | grep dub | cut -d' ' -f2)" +MACHINE="$(cat /proc/device-tree/digi,machine,name)" BOARD_VARIANT="$(cat /proc/device-tree/digi,hwid,variant)" BOARD_SN="$(cat /proc/device-tree/digi,hwid,sn)" BOARD_VERSION="$(cat /proc/device-tree/digi,carrierboard,version)" @@ -202,9 +204,9 @@ printf "\n\n" echo "" echo "||*Component*|*Version*" - echo "|| DUT | SN-${BOARD_SN}, CC6 ${BOARD_VARIANT} SBCv${BOARD_VERSION} board_ID=${BOARD_ID}." + echo "|| DUT | SN-${BOARD_SN}, ${MACHINE} ${BOARD_VARIANT} SBCv${BOARD_VERSION} board_ID=${BOARD_ID}." echo "|| U-Boot | ${UBOOT_VERSION}" - echo "|| Firmware | ${DEY_VERSION}-$(cat /etc/version)" + echo "|| Firmware | ${DISTRO}-${DEY_VERSION}-$(cat /etc/version)" echo "|| Kernel | $(uname -a)" printf "\n\n" ) | tee ${FILE}