summaryrefslogtreecommitdiffstats
path: root/classes/image_types_ostree.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r--classes/image_types_ostree.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 832f945..efc5bcf 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -14,7 +14,7 @@ BUILD_OSTREE_TARBALL ??= "1"
14SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}" 14SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}"
15 15
16IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" 16IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*"
17CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" 17CONVERSION_CMD:tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]"
18CONVERSIONTYPES:append = " tar" 18CONVERSIONTYPES:append = " tar"
19 19
20TAR_IMAGE_ROOTFS:task-image-ostree = "${OSTREE_ROOTFS}" 20TAR_IMAGE_ROOTFS:task-image-ostree = "${OSTREE_ROOTFS}"
@@ -126,7 +126,7 @@ IMAGE_CMD:ostree () {
126 cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest 126 cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest
127} 127}
128 128
129IMAGE_TYPEDEP_ostreecommit = "ostree" 129IMAGE_TYPEDEP:ostreecommit = "ostree"
130do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot" 130do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot"
131do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock" 131do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock"
132IMAGE_CMD:ostreecommit () { 132IMAGE_CMD:ostreecommit () {
@@ -151,7 +151,7 @@ IMAGE_CMD:ostreecommit () {
151 fi 151 fi
152} 152}
153 153
154IMAGE_TYPEDEP_ostreepush = "ostreecommit" 154IMAGE_TYPEDEP:ostreepush = "ostreecommit"
155do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" 155do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot"
156do_image_ostreepush[lockfiles] += "${OSTREE_REPO}/ostree.lock" 156do_image_ostreepush[lockfiles] += "${OSTREE_REPO}/ostree.lock"
157IMAGE_CMD:ostreepush () { 157IMAGE_CMD:ostreepush () {
@@ -177,7 +177,7 @@ IMAGE_CMD:ostreepush () {
177 fi 177 fi
178} 178}
179 179
180IMAGE_TYPEDEP_garagesign = "ostreepush" 180IMAGE_TYPEDEP:garagesign = "ostreepush"
181do_image_garagesign[depends] += "unzip-native:do_populate_sysroot" 181do_image_garagesign[depends] += "unzip-native:do_populate_sysroot"
182# This lock solves OTA-1866, which is that removing GARAGE_SIGN_REPO while using 182# This lock solves OTA-1866, which is that removing GARAGE_SIGN_REPO while using
183# garage-sign simultaneously for two images often causes problems. 183# garage-sign simultaneously for two images often causes problems.
@@ -269,7 +269,7 @@ IMAGE_CMD:garagesign () {
269 fi 269 fi
270} 270}
271 271
272IMAGE_TYPEDEP_garagecheck = "garagesign" 272IMAGE_TYPEDEP:garagecheck = "garagesign"
273IMAGE_CMD:garagecheck () { 273IMAGE_CMD:garagecheck () {
274 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then 274 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
275 # if credentials are issued by a server that doesn't support offline signing, exit silently 275 # if credentials are issued by a server that doesn't support offline signing, exit silently