diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_types_ostree.bbclass | 18 | ||||
-rw-r--r-- | classes/image_types_ota.bbclass | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 4b27f34..3e67043 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -169,25 +169,19 @@ IMAGE_CMD_ostreecommit () { | |||
169 | fi | 169 | fi |
170 | 170 | ||
171 | # Commit the result | 171 | # Commit the result |
172 | ostree --repo=${OSTREE_REPO} commit \ | 172 | ostree_target_hash=$(ostree --repo=${OSTREE_REPO} commit \ |
173 | --tree=dir=${OSTREE_ROOTFS} \ | 173 | --tree=dir=${OSTREE_ROOTFS} \ |
174 | --skip-if-unchanged \ | 174 | --skip-if-unchanged \ |
175 | --branch=${OSTREE_BRANCHNAME} \ | 175 | --branch=${OSTREE_BRANCHNAME} \ |
176 | --subject="${OSTREE_COMMIT_SUBJECT}" \ | 176 | --subject="${OSTREE_COMMIT_SUBJECT}" \ |
177 | --body="${OSTREE_COMMIT_BODY}" \ | 177 | --body="${OSTREE_COMMIT_BODY}" \ |
178 | --add-metadata-string=version="${OSTREE_COMMIT_VERSION}" \ | 178 | --add-metadata-string=version="${OSTREE_COMMIT_VERSION}") |
179 | --bind-ref="${OSTREE_BRANCHNAME}-${IMAGE_BASENAME}" | 179 | |
180 | echo $ostree_target_hash > ${WORKDIR}/ostree_manifest | ||
180 | 181 | ||
181 | if [ ${@ oe.types.boolean('${OSTREE_UPDATE_SUMMARY}')} = True ]; then | 182 | if [ ${@ oe.types.boolean('${OSTREE_UPDATE_SUMMARY}')} = True ]; then |
182 | ostree --repo=${OSTREE_REPO} summary -u | 183 | ostree --repo=${OSTREE_REPO} summary -u |
183 | fi | 184 | fi |
184 | |||
185 | # To enable simultaneous bitbaking of two images with the same branch name, | ||
186 | # create a new ref in the repo using the basename of the image. (This first | ||
187 | # requires deleting it if it already exists.) Fixes OTA-2211. | ||
188 | ostree --repo=${OSTREE_REPO} refs --delete ${OSTREE_BRANCHNAME}-${IMAGE_BASENAME} | ||
189 | ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}) | ||
190 | ostree --repo=${OSTREE_REPO} refs --create=${OSTREE_BRANCHNAME}-${IMAGE_BASENAME} ${ostree_target_hash} | ||
191 | } | 185 | } |
192 | 186 | ||
193 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" | 187 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" |
@@ -237,7 +231,7 @@ IMAGE_CMD_garagesign () { | |||
237 | --home-dir ${GARAGE_SIGN_REPO} \ | 231 | --home-dir ${GARAGE_SIGN_REPO} \ |
238 | --credentials ${SOTA_PACKED_CREDENTIALS} | 232 | --credentials ${SOTA_PACKED_CREDENTIALS} |
239 | 233 | ||
240 | ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}-${IMAGE_BASENAME}) | 234 | ostree_target_hash=$(cat ${WORKDIR}/ostree_manifest) |
241 | 235 | ||
242 | # Use OSTree target hash as version if none was provided by the user | 236 | # Use OSTree target hash as version if none was provided by the user |
243 | target_version=${ostree_target_hash} | 237 | target_version=${ostree_target_hash} |
@@ -313,7 +307,7 @@ IMAGE_CMD_garagecheck () { | |||
313 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 307 | # if credentials are issued by a server that doesn't support offline signing, exit silently |
314 | unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0 | 308 | unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0 |
315 | 309 | ||
316 | ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}-${IMAGE_BASENAME}) | 310 | ostree_target_hash=$(cat ${WORKDIR}/ostree_manifest) |
317 | 311 | ||
318 | garage-check --ref=${ostree_target_hash} \ | 312 | garage-check --ref=${ostree_target_hash} \ |
319 | --credentials=${SOTA_PACKED_CREDENTIALS} \ | 313 | --credentials=${SOTA_PACKED_CREDENTIALS} \ |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 8f5a01a..17be0ee 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -64,7 +64,7 @@ IMAGE_CMD_ota () { | |||
64 | bbfatal "Invalid bootloader: ${OSTREE_BOOTLOADER}" | 64 | bbfatal "Invalid bootloader: ${OSTREE_BOOTLOADER}" |
65 | fi | 65 | fi |
66 | 66 | ||
67 | ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}-${IMAGE_BASENAME}) | 67 | ostree_target_hash=$(cat ${WORKDIR}/ostree_manifest) |
68 | 68 | ||
69 | ostree --repo=${OTA_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${ostree_target_hash} | 69 | ostree --repo=${OTA_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${ostree_target_hash} |
70 | kargs_list="" | 70 | kargs_list="" |