diff --git a/meta-digi-dey/classes/dey-image.bbclass b/meta-digi-dey/classes/dey-image.bbclass index e91c10b8e..57ec678e0 100644 --- a/meta-digi-dey/classes/dey-image.bbclass +++ b/meta-digi-dey/classes/dey-image.bbclass @@ -1,9 +1,9 @@ # 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 diff --git a/meta-digi-dey/recipes-core/images/core-image-base.bbappend b/meta-digi-dey/recipes-core/images/core-image-base.bbappend index 0e69f9af3..6736d81ed 100644 --- a/meta-digi-dey/recipes-core/images/core-image-base.bbappend +++ b/meta-digi-dey/recipes-core/images/core-image-base.bbappend @@ -1,5 +1,5 @@ # -# Copyright (C) 2016-2022, Digi International Inc. +# Copyright (C) 2016-2024, Digi International Inc. # 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) 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 diff --git a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo index 670ce3958..970026150 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-2023 by Digi International Inc. +# Copyright (C) 2016-2024 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -64,10 +64,10 @@ make_report(){ echo "- -" echo "--------------------------------------" echo "" - if [ -f "/etc/build" ]; then - cat /etc/build + if [ -f "/etc/buildinfo" ]; then + cat /etc/buildinfo else - echo "[NOT FOUND] /etc/build" + echo "[NOT FOUND] /etc/buildinfo" fi printf "\n\n" @@ -293,8 +293,8 @@ 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)" +DISTRO="$(sed -ne 's,DISTRO = \(.*\)$,\1,g;T;p' /etc/buildinfo)" +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')" if [ -z "${UBOOT_VERSION}" ]; then 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 "|| 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)" + echo "|| meta-digi | $(sed -ne '/^meta-digi-dey/s,.*= \(.*\)$,\1,g;T;p' /etc/buildinfo)" [ -n "${MCA_VERSION}" ] && echo "|| MCA | ${MCA_VERSION}" [ -n "${IOEXP_VERSION}" ] && echo "|| I/O Expander | ${IOEXP_VERSION}" printf "\n\n"