From 6a65b37b4513806fab13d81166a1bdfbe543d311 Mon Sep 17 00:00:00 2001 From: Lucien Mueller 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 --- 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 84b4255..5c1c693 100644 --- a/recipes-core/images/netmodule-linux-image-dev.bb +++ b/recipes-core/images/netmodule-linux-image-dev.bb @@ -57,4 +57,4 @@ IMAGE_INSTALL_append = " \ tmate \ imu-setup \ " -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 e4c358f..95f8de5 100644 --- a/recipes-core/images/netmodule-linux-image.bb +++ b/recipes-core/images/netmodule-linux-image.bb @@ -119,6 +119,6 @@ LICENSE = "BSD" IMAGE_OVERHEAD_FACTOR = "1.0" OSTREE_BOOTLOADER = "u-boot" -OSTREE_BRANCHNAME ?= "${MACHINE}" +OSTREE_BRANCHNAME ?= "${LAYERSERIES_CORENAMES}-${MACHINE}" BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};${PN}"