From 8e7a0aeb3682386ed674ed0f682634d6a50983b7 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 10 Jul 2019 16:15:23 +0200 Subject: Move OSTREE_BRANCHNAME to image_types_ostree.bbclass. If it is set in sota.bbclass and overwritten in local.conf, bitbake will rebuild everything. Now bitbake should only rerun the commands in image_types_ostree (and image_types_ota) as expected. Signed-off-by: Patrick Vacek --- classes/image_types_ostree.bbclass | 2 ++ classes/sota.bbclass | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 56d4d76..c9173d4 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -7,6 +7,8 @@ OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" OSTREE_COMMIT_BODY ??= "" OSTREE_UPDATE_SUMMARY ??= "0" OSTREE_DEPLOY_DEVICETREE ??= "0" +OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" +GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" BUILD_OSTREE_TARBALL ??= "1" diff --git a/classes/sota.bbclass b/classes/sota.bbclass index bf27b6d..743bd3b 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -39,7 +39,6 @@ INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER') == 'u-boo # Please redefine OSTREE_REPO in order to have a persistent OSTree repo export OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" -export OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" export OSTREE_OSNAME ?= "poky" export OSTREE_BOOTLOADER ??= 'u-boot' export OSTREE_BOOT_PARTITION ??= "/boot" @@ -48,7 +47,6 @@ INITRAMFS_IMAGE ?= "initramfs-ostree-image" GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" GARAGE_SIGN_KEYNAME ?= "garage-key" -GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" GARAGE_TARGET_VERSION ?= "" GARAGE_TARGET_URL ?= "" @@ -61,6 +59,6 @@ SOTA_MACHINE_qemux86-64 ?= "qemux86-64" SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" SOTA_OVERRIDES_BLACKLIST = "ostree ota" -SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" +SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO" inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest -- cgit v1.2.3-54-g00ecf