summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2019-07-19 09:39:57 +0200
committerGitHub <noreply@github.com>2019-07-19 09:39:57 +0200
commit80d0dccd2166eacc1d29940325768c423da3940f (patch)
tree09b870f9177831133606019a780c7544f3bb72e2
parentd4409182d2f31992fd8a26a5bcef8c99832b8089 (diff)
parent086f225a581204f45c1c95cffc06c55d3f4eee30 (diff)
downloadmeta-updater-80d0dccd2166eacc1d29940325768c423da3940f.tar.gz
Merge pull request #539 from doanac/customize-targets
Allow customization of data in targets.json
-rw-r--r--classes/image_types_ostree.bbclass6
-rw-r--r--classes/sota.bbclass1
2 files changed, 7 insertions, 0 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 56d4d76..5301c18 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -229,6 +229,12 @@ IMAGE_CMD_garagesign () {
229 ${target_url} \ 229 ${target_url} \
230 --sha256 ${ostree_target_hash} \ 230 --sha256 ${ostree_target_hash} \
231 --hardwareids ${SOTA_HARDWARE_ID} 231 --hardwareids ${SOTA_HARDWARE_ID}
232 if [ -n "${GARAGE_CUSTOMIZE_TARGET}" ]; then
233 bbplain "Running command(${GARAGE_CUSTOMIZE_TARGET}) to customize target"
234 ${GARAGE_CUSTOMIZE_TARGET} \
235 ${GARAGE_SIGN_REPO}/tufrepo/roles/unsigned/targets.json \
236 ${GARAGE_TARGET_NAME}-${target_version}
237 fi
232 garage-sign targets sign --repo tufrepo \ 238 garage-sign targets sign --repo tufrepo \
233 --home-dir ${GARAGE_SIGN_REPO} \ 239 --home-dir ${GARAGE_SIGN_REPO} \
234 --key-name=targets 240 --key-name=targets
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index bf27b6d..94c3043 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -51,6 +51,7 @@ GARAGE_SIGN_KEYNAME ?= "garage-key"
51GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" 51GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}"
52GARAGE_TARGET_VERSION ?= "" 52GARAGE_TARGET_VERSION ?= ""
53GARAGE_TARGET_URL ?= "" 53GARAGE_TARGET_URL ?= ""
54GARAGE_CUSTOMIZE_TARGET ?= ""
54 55
55SOTA_MACHINE ??="none" 56SOTA_MACHINE ??="none"
56SOTA_MACHINE_rpi ?= "raspberrypi" 57SOTA_MACHINE_rpi ?= "raspberrypi"