diff options
-rw-r--r-- | classes/image_repo_manifest.bbclass | 2 | ||||
-rw-r--r-- | classes/image_types_ostree.bbclass | 1 | ||||
-rw-r--r-- | classes/image_types_ota.bbclass | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/classes/image_repo_manifest.bbclass b/classes/image_repo_manifest.bbclass index 12f56f0..3e4ecbb 100644 --- a/classes/image_repo_manifest.bbclass +++ b/classes/image_repo_manifest.bbclass | |||
@@ -15,7 +15,7 @@ inherit python3native | |||
15 | buildinfo_manifest () { | 15 | buildinfo_manifest () { |
16 | repotool=`which repo || true` | 16 | repotool=`which repo || true` |
17 | if [ -n "$repotool" ]; then | 17 | if [ -n "$repotool" ]; then |
18 | python3 $repotool manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" | 18 | cd ${THISDIR} && python3 $repotool manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" |
19 | else | 19 | else |
20 | bbwarn "Android repo tool not found; manifest not copied." | 20 | bbwarn "Android repo tool not found; manifest not copied." |
21 | fi | 21 | fi |
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index e66956a..4d9b0a9 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -163,6 +163,7 @@ IMAGE_CMD_ostreecommit () { | |||
163 | 163 | ||
164 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" | 164 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" |
165 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" | 165 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" |
166 | do_image_ostreepush[lockfiles] += "${OSTREE_REPO}/ostree.lock" | ||
166 | IMAGE_CMD_ostreepush () { | 167 | IMAGE_CMD_ostreepush () { |
167 | # send a copy of the repo manifest to backend if available | 168 | # send a copy of the repo manifest to backend if available |
168 | local SEND_MANIFEST="" | 169 | local SEND_MANIFEST="" |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 1b7dbf8..283b50e 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -69,7 +69,7 @@ IMAGE_CMD_ota () { | |||
69 | echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions | 69 | echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions |
70 | } | 70 | } |
71 | 71 | ||
72 | EXTRA_IMAGECMD_ota-ext4 = "-O ^64bit,^metadata_csum -L otaroot -i 4096 -t ext4" | 72 | EXTRA_IMAGECMD_ota-ext4 = "-L otaroot -i 4096 -t ext4" |
73 | IMAGE_TYPEDEP_ota-ext4 = "ota" | 73 | IMAGE_TYPEDEP_ota-ext4 = "ota" |
74 | IMAGE_ROOTFS_task-image-ota-ext4 = "${OTA_SYSROOT}" | 74 | IMAGE_ROOTFS_task-image-ota-ext4 = "${OTA_SYSROOT}" |
75 | IMAGE_CMD_ota-ext4 () { | 75 | IMAGE_CMD_ota-ext4 () { |