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

meta-digi-dey: sysinfo: fix build info filename from "build" to "buildinfo" 

Commit 99f1425340 ("image-buildinfo: Improve and extend to SDK coverage too")
in the Poky layer changes the name of the default build information file from
"build" to "buildinfo", so this commit reflects this change by adapting the
sysinfo script.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2024-11-07 12:09:51 +01:00
parent d83cb9b914
commit 984def64fd
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-dey/classes/dey-image.bbclass
View File

@ -1,9 +1,9 @@
# DEY image features. # DEY image features.
# #
# Copyright (C) 2012 Digi International. # Copyright (C) 2012-2024 Digi International.
# #
# Add build info to rootfs images (/etc/build) # Add build info to rootfs images (/etc/buildinfo)
# #
inherit image-buildinfo inherit image-buildinfo

4
meta-digi-dey/recipes-core/images/core-image-base.bbappend
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2016-2022, Digi International Inc. # Copyright (C) 2016-2024, Digi International Inc.
# #
IMAGE_FEATURES += " \ IMAGE_FEATURES += " \
@ -25,5 +25,5 @@ CORE_IMAGE_BASE_INSTALL:append:ccimx6ul = " connectcore-demo-example"
# SDK features (for toolchains generated from an image with populate_sdk) # SDK features (for toolchains generated from an image with populate_sdk)
SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs" SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs"
# Add our dey-image tweaks to the final image (like /etc/build info) # Add our dey-image tweaks to the final image (like /etc/buildinfo info)
inherit dey-image inherit dey-image

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

@ -3,7 +3,7 @@
# #
# sysinfo # sysinfo
# #
# Copyright (C) 2016-2023 by Digi International Inc. # Copyright (C) 2016-2024 by Digi International Inc.
# All rights reserved. # All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify it # This program is free software; you can redistribute it and/or modify it
@ -64,10 +64,10 @@ make_report(){
echo "- -" echo "- -"
echo "--------------------------------------" echo "--------------------------------------"
echo "" echo ""
if [ -f "/etc/build" ]; then if [ -f "/etc/buildinfo" ]; then
cat /etc/build cat /etc/buildinfo
else else
echo "[NOT FOUND] /etc/build" echo "[NOT FOUND] /etc/buildinfo"
fi fi
printf "\n\n" printf "\n\n"
@ -293,8 +293,8 @@ make_report(){
} }
DISTRO="$(sed -ne 's,DISTRO = \(.*\)$,\1,g;T;p' /etc/build)" DISTRO="$(sed -ne 's,DISTRO = \(.*\)$,\1,g;T;p' /etc/buildinfo)"
DEY_VERSION="$(sed -ne 's,DISTRO_VERSION = \(.*\)$,\1,g;T;p' /etc/build)" DEY_VERSION="$(sed -ne 's,DISTRO_VERSION = \(.*\)$,\1,g;T;p' /etc/buildinfo)"
UBOOT_VERSION="$(cat /proc/device-tree/digi,uboot,version 2>/dev/null | tr -d '\0')" UBOOT_VERSION="$(cat /proc/device-tree/digi,uboot,version 2>/dev/null | tr -d '\0')"
if [ -z "${UBOOT_VERSION}" ]; then if [ -z "${UBOOT_VERSION}" ]; then
UBOOT_PARTITION="/dev/mmcblk0boot0" UBOOT_PARTITION="/dev/mmcblk0boot0"
@ -355,7 +355,7 @@ REPORT_PATH="/tmp/sysinfo-${DEY_VERSION}-${BOARD_SN}-${DATE}"
echo "|| Firmware version | $(sed -n 's/^firmware \(.*\)/\1/p' < /etc/sw-versions)" echo "|| Firmware version | $(sed -n 's/^firmware \(.*\)/\1/p' < /etc/sw-versions)"
echo "|| DEY version | ${DISTRO}-${DEY_VERSION}-$(cat /etc/version)" echo "|| DEY version | ${DISTRO}-${DEY_VERSION}-$(cat /etc/version)"
echo "|| Kernel | $(uname -a)" echo "|| Kernel | $(uname -a)"
echo "|| meta-digi | $(sed -ne '/^meta-digi-dey/s,.*= \(.*\)$,\1,g;T;p' /etc/build)" echo "|| meta-digi | $(sed -ne '/^meta-digi-dey/s,.*= \(.*\)$,\1,g;T;p' /etc/buildinfo)"
[ -n "${MCA_VERSION}" ] && echo "|| MCA | ${MCA_VERSION}" [ -n "${MCA_VERSION}" ] && echo "|| MCA | ${MCA_VERSION}"
[ -n "${IOEXP_VERSION}" ] && echo "|| I/O Expander | ${IOEXP_VERSION}" [ -n "${IOEXP_VERSION}" ] && echo "|| I/O Expander | ${IOEXP_VERSION}"
printf "\n\n" printf "\n\n"