From 59a34fe84f4f14a4950165f18588a97e07d6c8b9 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 31 Aug 2024 15:37:50 +0200 Subject: [PATCH] Store list of preinstalled extensions EXTENSIONS and add VENDORPRETTYNAME to image fingerprint --- lib/functions/bsp/armbian-bsp-cli-deb.sh | 2 ++ lib/functions/configuration/main-config.sh | 1 + lib/functions/image/fingerprint.sh | 1 + 3 files changed, 4 insertions(+) diff --git a/lib/functions/bsp/armbian-bsp-cli-deb.sh b/lib/functions/bsp/armbian-bsp-cli-deb.sh index eef3db9ed36a..a0cb9c7d7909 100644 --- a/lib/functions/bsp/armbian-bsp-cli-deb.sh +++ b/lib/functions/bsp/armbian-bsp-cli-deb.sh @@ -97,6 +97,7 @@ function compile_armbian-bsp-cli() { BOARDFAMILY=${BOARDFAMILY} BUILD_REPOSITORY_URL=${BUILD_REPOSITORY_URL} BUILD_REPOSITORY_COMMIT=${BUILD_REPOSITORY_COMMIT} + EXTENSIONS=${ENABLE_EXTENSIONS} LINUXFAMILY=$LINUXFAMILY ARCH=$ARCHITECTURE BOOT_SOC=$BOOT_SOC @@ -107,6 +108,7 @@ function compile_armbian-bsp-cli() { FORCE_BOOTSCRIPT_UPDATE=$FORCE_BOOTSCRIPT_UPDATE FORCE_UBOOT_UPDATE=$FORCE_UBOOT_UPDATE VENDOR="$VENDOR" + VENDORPRETTYNAME="$VENDORPRETTYNAME" VENDORDOCS="$VENDORDOCS" VENDORURL="$VENDORURL" VENDORSUPPORT="$VENDORSUPPORT" diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 91c354c2d2e9..8df5570373b6 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -40,6 +40,7 @@ function do_main_configuration() { # Armbian image is set as unofficial if build manually or without declaring from outside [[ -z $VENDOR ]] && VENDOR="Armbian-unofficial" + [[ -z $VENDORPRETTYNAME ]] && VENDORPRETTYNAME="${VENDOR}" # Use framework defaults for community Armbian images and unsupported distribution when building Armbian distribution if [[ ${VENDOR} == "Armbian" ]] && [[ ${BOARD_TYPE} != "conf" || $(cat $SRC/config/distributions/$RELEASE/support) != "supported" ]]; then diff --git a/lib/functions/image/fingerprint.sh b/lib/functions/image/fingerprint.sh index 3bca89cf1b43..1fbb7914a09a 100644 --- a/lib/functions/image/fingerprint.sh +++ b/lib/functions/image/fingerprint.sh @@ -23,6 +23,7 @@ function fingerprint_image() { Build date: $(date +'%d.%m.%Y') Sources: ${BUILD_REPOSITORY_URL} Sources rev: ${BUILD_REPOSITORY_COMMIT} + Extensions: ${ENABLE_EXTENSIONS} Authors: https://www.armbian.com/authors Maintainer: ${MAINTAINER} <$MAINTAINERMAIL> Support: ${VENDORSUPPORT}