diff options
| author | cajun-rat <phil@advancedtelematic.com> | 2018-01-10 17:10:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 17:10:21 +0100 |
| commit | ca45d174eb7228c2ef4cf9b2619c43208a958fb6 (patch) | |
| tree | 9193124690f944188ac9f32c53a6546c58d8f423 | |
| parent | 5adf14054c67acfaaac96d062cec29973ed0e99f (diff) | |
| parent | c1872be518040d03f8836cec92e7e0a80f9a43f3 (diff) | |
| download | meta-updater-ca45d174eb7228c2ef4cf9b2619c43208a958fb6.tar.gz | |
Merge pull request #224 from advancedtelematic/bugfix/tufreponame
Fix --repo parameter for garage-sign
| -rw-r--r-- | classes/image_types_ostree.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 3edbc72..cf2e52f 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -196,7 +196,7 @@ IMAGE_CMD_garagesign () { | |||
| 196 | fi | 196 | fi |
| 197 | 197 | ||
| 198 | rm -rf ${GARAGE_SIGN_REPO} | 198 | rm -rf ${GARAGE_SIGN_REPO} |
| 199 | garage-sign init --repo ${GARAGE_SIGN_REPO} --home-dir ${GARAGE_SIGN_REPO} --credentials ${SOTA_PACKED_CREDENTIALS} | 199 | garage-sign init --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} --credentials ${SOTA_PACKED_CREDENTIALS} |
| 200 | 200 | ||
| 201 | ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}) | 201 | ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}) |
| 202 | 202 | ||
| @@ -204,11 +204,11 @@ IMAGE_CMD_garagesign () { | |||
| 204 | # in which case targets.json should be pulled again and the whole procedure repeated | 204 | # in which case targets.json should be pulled again and the whole procedure repeated |
| 205 | push_success=0 | 205 | push_success=0 |
| 206 | for push_retries in $( seq 3 ); do | 206 | for push_retries in $( seq 3 ); do |
| 207 | garage-sign targets pull --repo ${GARAGE_SIGN_REPO} --home-dir ${GARAGE_SIGN_REPO} | 207 | garage-sign targets pull --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} |
| 208 | garage-sign targets add --repo ${GARAGE_SIGN_REPO} --home-dir ${GARAGE_SIGN_REPO} --name ${OSTREE_BRANCHNAME} --format OSTREE --version ${ostree_target_hash} --length 0 --url "https://example.com/" --sha256 ${ostree_target_hash} --hardwareids ${MACHINE} | 208 | garage-sign targets add --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} --name ${OSTREE_BRANCHNAME} --format OSTREE --version ${ostree_target_hash} --length 0 --url "https://example.com/" --sha256 ${ostree_target_hash} --hardwareids ${MACHINE} |
| 209 | garage-sign targets sign --repo ${GARAGE_SIGN_REPO} --home-dir ${GARAGE_SIGN_REPO} --key-name=targets | 209 | garage-sign targets sign --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} --key-name=targets |
| 210 | errcode=0 | 210 | errcode=0 |
| 211 | garage-sign targets push --repo ${GARAGE_SIGN_REPO} --home-dir ${GARAGE_SIGN_REPO} || errcode=$? | 211 | garage-sign targets push --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} || errcode=$? |
| 212 | if [ "$errcode" -eq "0" ]; then | 212 | if [ "$errcode" -eq "0" ]; then |
| 213 | push_success=1 | 213 | push_success=1 |
| 214 | break | 214 | break |
