From ba7c13cbc80ea89b0fd5bf2f0ab889c82f516352 Mon Sep 17 00:00:00 2001
From: Lucien Mueller <lucien.mueller@netmodule.com>
Date: Fri, 25 Oct 2019 14:36:09 +0200
Subject: [PATCH] distro: added yocto version name as prefix on the ostree
 branchname for "normal" and "dev" image.

BugzID: 59761

Signed-off-by: Lucien Mueller <lucien.mueller@netmodule.com>
---
 recipes-core/images/netmodule-linux-image-dev.bb | 2 +-
 recipes-core/images/netmodule-linux-image.bb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-core/images/netmodule-linux-image-dev.bb b/recipes-core/images/netmodule-linux-image-dev.bb
index 5340ecd..36a6e76 100644
--- a/recipes-core/images/netmodule-linux-image-dev.bb
+++ b/recipes-core/images/netmodule-linux-image-dev.bb
@@ -55,4 +55,4 @@ IMAGE_INSTALL_append = " \
                 board-descriptor \
                 tmate \
                 "
-OSTREE_BRANCHNAME = "${MACHINE}-dev"
+OSTREE_BRANCHNAME = "${LAYERSERIES_CORENAMES}-${MACHINE}-dev"
diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb
index ed9ac01..56136c8 100644
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@@ -116,6 +116,6 @@ LICENSE = "BSD"
 KERNEL_IMAGETYPE_sota = "fitImage"
 IMAGE_OVERHEAD_FACTOR = "1.0"
 OSTREE_BOOTLOADER = "u-boot"
-OSTREE_BRANCHNAME ?= "${MACHINE}"
+OSTREE_BRANCHNAME ?= "${LAYERSERIES_CORENAMES}-${MACHINE}"
 
 BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};${PN}"