From 01700ac5f0f3aaaee17b9dc426b0697996d17c70 Mon Sep 17 00:00:00 2001 From: Serhiy Stetskovych Date: Wed, 21 Nov 2018 11:47:31 +0200 Subject: Allow setup custom hardware_id Signed-off-by: Serhiy Stetskovych --- classes/image_types_ostree.bbclass | 2 +- classes/sota.bbclass | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 5286efc..05c73ff 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -235,7 +235,7 @@ IMAGE_CMD_garagesign () { --length 0 \ --url "${GARAGE_TARGET_URL}" \ --sha256 ${ostree_target_hash} \ - --hardwareids ${MACHINE} + --hardwareids ${SOTA_HARDWARE_ID} garage-sign targets sign --repo tufrepo \ --home-dir ${GARAGE_SIGN_REPO} \ --key-name=targets diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 98cc3de..7fb54dc 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -11,6 +11,7 @@ HOSTTOOLS_NONFATAL += "java" SOTA_CLIENT ??= "aktualizr" SOTA_CLIENT_PROV ??= "aktualizr-auto-prov" SOTA_DEPLOY_CREDENTIALS ?= "1" +SOTA_HARDWARE_ID ??= "${MACHINE}" IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}" IMAGE_CLASSES += " image_types_ostree image_types_ota" @@ -29,7 +30,7 @@ INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == # Please redefine OSTREE_REPO in order to have a persistent OSTree repo OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" -OSTREE_BRANCHNAME ?= "${MACHINE}" +OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" OSTREE_OSNAME ?= "poky" INITRAMFS_IMAGE ?= "initramfs-ostree-image" OSTREE_BOOTLOADER ??= 'u-boot' -- cgit v1.2.3-54-g00ecf