diff options
-rw-r--r-- | classes/image_types_ostree.bbclass | 10 | ||||
-rw-r--r-- | classes/image_types_ota.bbclass | 4 |
2 files changed, 7 insertions, 7 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" | |||
14 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}" | 14 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}" |
15 | 15 | ||
16 | IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" | 16 | IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" |
17 | CONVERSION_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 ]" | 17 | CONVERSION_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 ]" |
18 | CONVERSIONTYPES:append = " tar" | 18 | CONVERSIONTYPES:append = " tar" |
19 | 19 | ||
20 | TAR_IMAGE_ROOTFS:task-image-ostree = "${OSTREE_ROOTFS}" | 20 | TAR_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 | ||
129 | IMAGE_TYPEDEP_ostreecommit = "ostree" | 129 | IMAGE_TYPEDEP:ostreecommit = "ostree" |
130 | do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot" | 130 | do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot" |
131 | do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock" | 131 | do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock" |
132 | IMAGE_CMD:ostreecommit () { | 132 | IMAGE_CMD:ostreecommit () { |
@@ -151,7 +151,7 @@ IMAGE_CMD:ostreecommit () { | |||
151 | fi | 151 | fi |
152 | } | 152 | } |
153 | 153 | ||
154 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" | 154 | IMAGE_TYPEDEP:ostreepush = "ostreecommit" |
155 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" | 155 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" |
156 | do_image_ostreepush[lockfiles] += "${OSTREE_REPO}/ostree.lock" | 156 | do_image_ostreepush[lockfiles] += "${OSTREE_REPO}/ostree.lock" |
157 | IMAGE_CMD:ostreepush () { | 157 | IMAGE_CMD:ostreepush () { |
@@ -177,7 +177,7 @@ IMAGE_CMD:ostreepush () { | |||
177 | fi | 177 | fi |
178 | } | 178 | } |
179 | 179 | ||
180 | IMAGE_TYPEDEP_garagesign = "ostreepush" | 180 | IMAGE_TYPEDEP:garagesign = "ostreepush" |
181 | do_image_garagesign[depends] += "unzip-native:do_populate_sysroot" | 181 | do_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 | ||
272 | IMAGE_TYPEDEP_garagecheck = "garagesign" | 272 | IMAGE_TYPEDEP:garagecheck = "garagesign" |
273 | IMAGE_CMD:garagecheck () { | 273 | IMAGE_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 |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 41c4801..02c5e99 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -1,6 +1,6 @@ | |||
1 | OTA_SYSROOT = "${WORKDIR}/ota-sysroot" | 1 | OTA_SYSROOT = "${WORKDIR}/ota-sysroot" |
2 | TAR_IMAGE_ROOTFS:task-image-ota = "${OTA_SYSROOT}" | 2 | TAR_IMAGE_ROOTFS:task-image-ota = "${OTA_SYSROOT}" |
3 | IMAGE_TYPEDEP_ota = "ostreecommit" | 3 | IMAGE_TYPEDEP:ota = "ostreecommit" |
4 | do_image_ota[dirs] = "${OTA_SYSROOT}" | 4 | do_image_ota[dirs] = "${OTA_SYSROOT}" |
5 | do_image_ota[cleandirs] = "${OTA_SYSROOT}" | 5 | do_image_ota[cleandirs] = "${OTA_SYSROOT}" |
6 | do_image_ota[depends] = "${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER') == 'grub' else ''} \ | 6 | do_image_ota[depends] = "${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER') == 'grub' else ''} \ |
@@ -78,7 +78,7 @@ IMAGE_CMD:ota () { | |||
78 | } | 78 | } |
79 | 79 | ||
80 | EXTRA_IMAGECMD:ota-ext4 = "-L otaroot -i 4096 -t ext4" | 80 | EXTRA_IMAGECMD:ota-ext4 = "-L otaroot -i 4096 -t ext4" |
81 | IMAGE_TYPEDEP_ota-ext4 = "ota" | 81 | IMAGE_TYPEDEP:ota-ext4 = "ota" |
82 | IMAGE_ROOTFS:task-image-ota-ext4 = "${OTA_SYSROOT}" | 82 | IMAGE_ROOTFS:task-image-ota-ext4 = "${OTA_SYSROOT}" |
83 | IMAGE_CMD:ota-ext4 () { | 83 | IMAGE_CMD:ota-ext4 () { |
84 | ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ota-ext4 | 84 | ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ota-ext4 |