summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlbonn <lbonn@users.noreply.github.com>2020-05-29 15:26:05 +0200
committerGitHub <noreply@github.com>2020-05-29 15:26:05 +0200
commit35240e670e811d149d4765e4a6a8fceae7d642df (patch)
tree014a66c6f7376d5964c6483f601b09ae91cc56fa
parentae495e3e8f32934679cc412d83aa6cdc57815a8a (diff)
parentc68fee465a027f39c25604ba54095c6718b23da9 (diff)
downloadmeta-updater-35240e670e811d149d4765e4a6a8fceae7d642df.tar.gz
Merge pull request #729 from advancedtelematic/rls/2020.7
Bump aktualizr to 2020.7 revision
-rw-r--r--classes/image_types_ostree.bbclass2
-rw-r--r--recipes-sota/aktualizr/aktualizr_git.bb8
2 files changed, 5 insertions, 5 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index bab4ed7..fd38d28 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -196,7 +196,7 @@ IMAGE_CMD_ostreepush () {
196 196
197 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then 197 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
198 if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then 198 if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then
199 garage-push -vv --repo=${OSTREE_REPO} \ 199 garage-push --loglevel 0 --repo=${OSTREE_REPO} \
200 --ref=${OSTREE_BRANCHNAME} \ 200 --ref=${OSTREE_BRANCHNAME} \
201 --credentials=${SOTA_PACKED_CREDENTIALS} \ 201 --credentials=${SOTA_PACKED_CREDENTIALS} \
202 --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt \ 202 --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt \
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 50f0c34..4f32887 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -17,7 +17,7 @@ PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so"
17PV = "1.0+git${SRCPV}" 17PV = "1.0+git${SRCPV}"
18PR = "7" 18PR = "7"
19 19
20GARAGE_SIGN_PV = "0.7.1" 20GARAGE_SIGN_PV = "0.7.1-4-gf10c1da"
21 21
22SRC_URI = " \ 22SRC_URI = " \
23 gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ 23 gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \
@@ -29,10 +29,10 @@ SRC_URI = " \
29 ${@ d.expand("https://tuf-cli-releases.ota.here.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if not oe.types.boolean(d.getVar('GARAGE_SIGN_AUTOVERSION')) else ''} \ 29 ${@ d.expand("https://tuf-cli-releases.ota.here.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if not oe.types.boolean(d.getVar('GARAGE_SIGN_AUTOVERSION')) else ''} \
30 " 30 "
31 31
32SRC_URI[garagesign.md5sum] = "febc186527b324b23c5be3affcf90e54" 32SRC_URI[garagesign.md5sum] = "5f8eea81d1559d6fcb28d49c4298727c"
33SRC_URI[garagesign.sha256sum] = "a87c3f39d61492d6f813754159ed7ef1e59966c15726edef4cd188a63cde60d6" 33SRC_URI[garagesign.sha256sum] = "8b2f5bb164f19b41972069d3377e39c2eb9edffd471777161691039e12a71738"
34 34
35SRCREV = "a6392dec3fb9dda3cb8ab8aa10a81b2c0494cb3c" 35SRCREV = "cf44da79555d1897115eb350cbc43db1e213db03"
36BRANCH ?= "master" 36BRANCH ?= "master"
37 37
38S = "${WORKDIR}/git" 38S = "${WORKDIR}/git"