From 4f902846227f6b3039a6d88d35ffed3921289a9b Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Thu, 15 Aug 2019 12:23:33 +0200 Subject: Revert "Move OSTREE_BRANCHNAME to image_types_ostree.bbclass." This reverts commit 8e7a0aeb3682386ed674ed0f682634d6a50983b7. Signed-off-by: Laurent Bonnans --- 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 a9a8174..2e8e8f5 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -7,8 +7,6 @@ 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 d2a065c..51b0053 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -39,6 +39,7 @@ 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" @@ -47,6 +48,7 @@ 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 ?= "" GARAGE_CUSTOMIZE_TARGET ?= "" @@ -61,6 +63,6 @@ SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" SOTA_MACHINE_freedom-u540 ?= "freedom-u540" SOTA_OVERRIDES_BLACKLIST = "ostree ota" -SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO" +SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest -- cgit v1.2.3-54-g00ecf From 261c28a0dcbf6a9d1720094724aa95f2ad765b40 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Thu, 15 Aug 2019 12:23:57 +0200 Subject: Do not export anything in sota.bbclass A simple variable definition will be enough and doing an export there completely kills caching. Signed-off-by: Laurent Bonnans --- classes/sota.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 51b0053..86863d9 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -38,11 +38,11 @@ EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER') == 'u-boot', 'cpio.gz.u-boot', 'cpio.gz')}" # 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" +OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" +OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" +OSTREE_OSNAME ?= "poky" +OSTREE_BOOTLOADER ??= 'u-boot' +OSTREE_BOOT_PARTITION ??= "/boot" INITRAMFS_IMAGE ?= "initramfs-ostree-image" -- cgit v1.2.3-54-g00ecf