summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcajun-rat <phil@advancedtelematic.com>2017-11-24 14:53:41 +0100
committerGitHub <noreply@github.com>2017-11-24 14:53:41 +0100
commit7f7861a4531b3bb554f4bc3eeec3e58c721f9126 (patch)
tree041fc2499bf6afa8b03848faa22998c45a9ad246
parent678c0a500d16f9f2993c982bbbed190b22362dc9 (diff)
parent253ba5f803615dd0c9213a68886ba4250cc4e3e1 (diff)
downloadmeta-updater-7f7861a4531b3bb554f4bc3eeec3e58c721f9126.tar.gz
Merge pull request #187 from advancedtelematic/bugfix/tufrepo
Rename repo.url -> tufrepo.url
-rw-r--r--classes/image_types_ostree.bbclass10
-rw-r--r--recipes-sota/aktualizr/aktualizr_git.bb2
2 files changed, 4 insertions, 8 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index db8cae6..ea3c7a2 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -183,7 +183,7 @@ IMAGE_DEPENDS_garagesign = "garage-sign-native:do_populate_sysroot"
183IMAGE_CMD_garagesign () { 183IMAGE_CMD_garagesign () {
184 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then 184 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
185 # if credentials are issued by a server that doesn't support offline signing, exit silently 185 # if credentials are issued by a server that doesn't support offline signing, exit silently
186 unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec repo.url 2>&1 >/dev/null || exit 0 186 unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0
187 187
188 java_version=$( java -version 2>&1 | awk -F '"' '/version/ {print $2}' ) 188 java_version=$( java -version 2>&1 | awk -F '"' '/version/ {print $2}' )
189 if [ "${java_version}" = "" ]; then 189 if [ "${java_version}" = "" ]; then
@@ -198,11 +198,7 @@ IMAGE_CMD_garagesign () {
198 garage-sign init --repo ${GARAGE_SIGN_REPO} --home-dir ${GARAGE_SIGN_REPO} --credentials ${SOTA_PACKED_CREDENTIALS} 198 garage-sign init --repo ${GARAGE_SIGN_REPO} --home-dir ${GARAGE_SIGN_REPO} --credentials ${SOTA_PACKED_CREDENTIALS}
199 fi 199 fi
200 200
201 if [ -n "${GARAGE_SIGN_REPOSERVER}" ]; then 201 reposerver_args="--reposerver $( unzip -p ${SOTA_PACKED_CREDENTIALS} tufrepo.url )"
202 reposerver_args="--reposerver ${GARAGE_SIGN_REPOSERVER}"
203 else
204 reposerver_args=""
205 fi
206 202
207 ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}) 203 ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME})
208 204
@@ -235,7 +231,7 @@ IMAGE_DEPENDS_garagecheck = "aktualizr-native:do_populate_sysroot"
235IMAGE_CMD_garagecheck () { 231IMAGE_CMD_garagecheck () {
236 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then 232 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
237 # if credentials are issued by a server that doesn't support offline signing, exit silently 233 # if credentials are issued by a server that doesn't support offline signing, exit silently
238 unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec repo.url 2>&1 >/dev/null || exit 0 234 unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0
239 ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}) 235 ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME})
240 236
241 garage-check --ref=${ostree_target_hash} \ 237 garage-check --ref=${ostree_target_hash} \
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 3cd8a64..6c4b57c 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -18,7 +18,7 @@ PR = "7"
18SRC_URI = " \ 18SRC_URI = " \
19 git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ 19 git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \
20 " 20 "
21SRCREV = "612da8cae6e72ce7250de2fb5333af0d7041de7b" 21SRCREV = "5c871180bc3c1f845d0e95e6f4876a581ed0f919"
22BRANCH ?= "master" 22BRANCH ?= "master"
23 23
24S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"