From dc6c52ea995a558b3821cfbe1e81aa1d8a4df39a Mon Sep 17 00:00:00 2001
From: Marc Mattmueller <marc.mattmueller@netmodule.com>
Date: Fri, 13 Nov 2020 14:06:55 +0100
Subject: [PATCH] release 1.1.2: replaces external git srcrev in BUILDNAME with
 DISTRO_VERSION

files affected:
 - conf/distro/netmodule-linux-ostree.conf
 - recipes-core/images/netmodule-linux-image-minimal.bb
 - recipes-core/images/netmodule-linux-image.bb

Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
---
 conf/distro/netmodule-linux-ostree.conf              | 2 +-
 recipes-core/images/netmodule-linux-image-minimal.bb | 2 +-
 recipes-core/images/netmodule-linux-image.bb         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/distro/netmodule-linux-ostree.conf b/conf/distro/netmodule-linux-ostree.conf
index 8ec7e7d..68be32c 100644
--- a/conf/distro/netmodule-linux-ostree.conf
+++ b/conf/distro/netmodule-linux-ostree.conf
@@ -9,7 +9,7 @@ DISTRO_VARIANT = " with ostree"
 REPRODUCIBLE_TIMESTAMP_ROOTFS = ""
 
 OSTREE_INITRAMFS_FSTYPES = "ext4.gz.u-boot"
-OSTREE_COMMIT_SUBJECT = "${IMAGE_BASENAME};${EXTERNALSRC_GIT_SRCREV}"
+OSTREE_COMMIT_SUBJECT = "${IMAGE_BASENAME};${DISTRO_VERSION}"
 
 # Unneeded tools added by sota class
 IMAGE_INSTALL_remove = "aktualizr aktualizr-info"
diff --git a/recipes-core/images/netmodule-linux-image-minimal.bb b/recipes-core/images/netmodule-linux-image-minimal.bb
index a3b4e16..d396a6f 100644
--- a/recipes-core/images/netmodule-linux-image-minimal.bb
+++ b/recipes-core/images/netmodule-linux-image-minimal.bb
@@ -30,5 +30,5 @@ IMAGE_INSTALL = " \
 
 LICENSE = "BSD"
 
-BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};${PN}"
+BUILDNAME = "${DISTRO_VERSION};${DATETIME};${PN}"
 
diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb
index 4442ce2..02981bb 100644
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@@ -113,7 +113,7 @@ IMAGE_OVERHEAD_FACTOR = "1.0"
 OSTREE_BOOTLOADER = "u-boot"
 OSTREE_BRANCHNAME = "${LAYERSERIES_CORENAMES}-${MACHINE}"
 
-BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};${PN}"
+BUILDNAME = "${DISTRO_VERSION};${DATETIME};${PN}"
 
 TOOLCHAIN_TARGET_TASK_append = " \
     cpputest-staticdev \