summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMykhaylo Sul <ext-mykhaylo.sul@here.com>2019-04-03 20:39:01 +0200
committerMykhaylo Sul <ext-mykhaylo.sul@here.com>2019-04-03 20:39:01 +0200
commit050a27bddf830a799e8f8657b4227eded85dbd6f (patch)
treeee91129f60be40394a4f15bf263911475bc123df
parentd39d8b167797243fcf067c6faa6b4220d697c71c (diff)
downloadmeta-updater-050a27bddf830a799e8f8657b4227eded85dbd6f.tar.gz
OTA-2418: Remove example.com URL from automated garage-sign usagefeat/OTA-2418/remove-example.com
Signed-off-by: Mykhaylo Sul <ext-mykhaylo.sul@here.com>
-rw-r--r--classes/image_types_ostree.bbclass7
-rw-r--r--classes/sota.bbclass2
-rw-r--r--conf/layer.conf2
3 files changed, 8 insertions, 3 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 41327e1..56d4d76 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -212,6 +212,11 @@ IMAGE_CMD_garagesign () {
212 # Push may fail due to race condition when multiple build machines try to push simultaneously 212 # Push may fail due to race condition when multiple build machines try to push simultaneously
213 # in which case targets.json should be pulled again and the whole procedure repeated 213 # in which case targets.json should be pulled again and the whole procedure repeated
214 push_success=0 214 push_success=0
215 target_url=""
216 if [ -n "${GARAGE_TARGET_URL}" ]; then
217 target_url='--url ${GARAGE_TARGET_URL}'
218 fi
219
215 for push_retries in $( seq 3 ); do 220 for push_retries in $( seq 3 ); do
216 garage-sign targets pull --repo tufrepo \ 221 garage-sign targets pull --repo tufrepo \
217 --home-dir ${GARAGE_SIGN_REPO} 222 --home-dir ${GARAGE_SIGN_REPO}
@@ -221,7 +226,7 @@ IMAGE_CMD_garagesign () {
221 --format OSTREE \ 226 --format OSTREE \
222 --version ${target_version} \ 227 --version ${target_version} \
223 --length 0 \ 228 --length 0 \
224 --url "${GARAGE_TARGET_URL}" \ 229 ${target_url} \
225 --sha256 ${ostree_target_hash} \ 230 --sha256 ${ostree_target_hash} \
226 --hardwareids ${SOTA_HARDWARE_ID} 231 --hardwareids ${SOTA_HARDWARE_ID}
227 garage-sign targets sign --repo tufrepo \ 232 garage-sign targets sign --repo tufrepo \
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index 92b4c43..7ffcd23 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -36,7 +36,7 @@ GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo"
36GARAGE_SIGN_KEYNAME ?= "garage-key" 36GARAGE_SIGN_KEYNAME ?= "garage-key"
37GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" 37GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}"
38GARAGE_TARGET_VERSION ?= "" 38GARAGE_TARGET_VERSION ?= ""
39GARAGE_TARGET_URL ?= "https://example.com/" 39GARAGE_TARGET_URL ?= ""
40 40
41SOTA_MACHINE ??="none" 41SOTA_MACHINE ??="none"
42SOTA_MACHINE_rpi ?= "raspberrypi" 42SOTA_MACHINE_rpi ?= "raspberrypi"
diff --git a/conf/layer.conf b/conf/layer.conf
index 627a1b8..ec791bb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILE_PATTERN_sota = "^${LAYERDIR}/"
10BBFILE_PRIORITY_sota = "7" 10BBFILE_PRIORITY_sota = "7"
11 11
12LAYERDEPENDS_sota = "filesystems-layer" 12LAYERDEPENDS_sota = "filesystems-layer"
13LAYERSERIES_COMPAT_sota = "thud" 13LAYERSERIES_COMPAT_sota = "thud warrior"