summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorSerhiy Stetskovych <patriotyk@gmail.com>2018-11-21 11:47:31 +0200
committerSerhiy Stetskovych <patriotyk@gmail.com>2018-11-22 11:15:35 +0200
commit01700ac5f0f3aaaee17b9dc426b0697996d17c70 (patch)
tree7888ddcd76fe66c97725e3542f66035e5684f359 /classes
parent616cbf7d42dc7a6d9b09803fd7e6080299264f74 (diff)
downloadmeta-updater-01700ac5f0f3aaaee17b9dc426b0697996d17c70.tar.gz
Allow setup custom hardware_idfeat/hardware_id
Signed-off-by: Serhiy Stetskovych <patriotyk@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/image_types_ostree.bbclass2
-rw-r--r--classes/sota.bbclass3
2 files changed, 3 insertions, 2 deletions
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 () {
235 --length 0 \ 235 --length 0 \
236 --url "${GARAGE_TARGET_URL}" \ 236 --url "${GARAGE_TARGET_URL}" \
237 --sha256 ${ostree_target_hash} \ 237 --sha256 ${ostree_target_hash} \
238 --hardwareids ${MACHINE} 238 --hardwareids ${SOTA_HARDWARE_ID}
239 garage-sign targets sign --repo tufrepo \ 239 garage-sign targets sign --repo tufrepo \
240 --home-dir ${GARAGE_SIGN_REPO} \ 240 --home-dir ${GARAGE_SIGN_REPO} \
241 --key-name=targets 241 --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"
11SOTA_CLIENT ??= "aktualizr" 11SOTA_CLIENT ??= "aktualizr"
12SOTA_CLIENT_PROV ??= "aktualizr-auto-prov" 12SOTA_CLIENT_PROV ??= "aktualizr-auto-prov"
13SOTA_DEPLOY_CREDENTIALS ?= "1" 13SOTA_DEPLOY_CREDENTIALS ?= "1"
14SOTA_HARDWARE_ID ??= "${MACHINE}"
14 15
15IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}" 16IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}"
16IMAGE_CLASSES += " image_types_ostree image_types_ota" 17IMAGE_CLASSES += " image_types_ostree image_types_ota"
@@ -29,7 +30,7 @@ INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) ==
29 30
30# Please redefine OSTREE_REPO in order to have a persistent OSTree repo 31# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
31OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" 32OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
32OSTREE_BRANCHNAME ?= "${MACHINE}" 33OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}"
33OSTREE_OSNAME ?= "poky" 34OSTREE_OSNAME ?= "poky"
34INITRAMFS_IMAGE ?= "initramfs-ostree-image" 35INITRAMFS_IMAGE ?= "initramfs-ostree-image"
35OSTREE_BOOTLOADER ??= 'u-boot' 36OSTREE_BOOTLOADER ??= 'u-boot'