Try to set hardware IDs in local.conf.bugfix/PRO-5140/hardware_ids

Communicating the IDs to the images works, but getting the IDs in the
garage-push commits does not. I can get the variables exported, but the
script still uses the wrong (old) value. Not sure why.

2 files changed, 4 insertions, 1 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index bc44e33..1313c40 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -10,6 +10,7 @@ do_image_ostree[depends] += "ostree-native:do_populate_sysroot \
 export OSTREE_REPO
 export OSTREE_BRANCHNAME
 export GARAGE_TARGET_NAME
+export SOTA_HARDWARE_ID
 
 RAMDISK_EXT ?= ".${OSTREE_INITRAMFS_FSTYPES}"
 
@@ -220,7 +221,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 38d4ce5..d9df83a 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -36,6 +36,8 @@ GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}"
 GARAGE_TARGET_VERSION ?= ""
 GARAGE_TARGET_URL ?= "https://example.com/"
 
+SOTA_HARDWARE_ID ?= "${MACHINE}"
+
 SOTA_MACHINE ??="none"
 SOTA_MACHINE_rpi ?= "raspberrypi"
 SOTA_MACHINE_porter ?= "porter"