diff options
-rw-r--r-- | classes/image_types_ostree.bbclass | 5 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 0f0fd28..f3f9c08 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -1,5 +1,7 @@ | |||
1 | # OSTree deployment | 1 | # OSTree deployment |
2 | inherit distro_features_check | 2 | inherit features_check |
3 | |||
4 | REQUIRED_DISTRO_FEATURES = "usrmerge" | ||
3 | 5 | ||
4 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 6 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
5 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" | 7 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" |
@@ -16,7 +18,6 @@ IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" | |||
16 | 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 | 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 | CONVERSIONTYPES_append = " tar" | 19 | CONVERSIONTYPES_append = " tar" |
18 | 20 | ||
19 | REQUIRED_DISTRO_FEATURES = "usrmerge" | ||
20 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" | 21 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" |
21 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" | 22 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" |
22 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" | 23 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index cef66ab..211db89 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -15,7 +15,7 @@ RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc pyt | |||
15 | PV = "1.0+git${SRCPV}" | 15 | PV = "1.0+git${SRCPV}" |
16 | PR = "7" | 16 | PR = "7" |
17 | 17 | ||
18 | GARAGE_SIGN_PV = "0.7.0-49-g5ffd420" | 18 | GARAGE_SIGN_PV = "0.7.0-59-gf6013d6" |
19 | 19 | ||
20 | SRC_URI = " \ | 20 | SRC_URI = " \ |
21 | gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ | 21 | gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ |
@@ -27,10 +27,10 @@ SRC_URI = " \ | |||
27 | ${@ d.expand("https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if d.getVar('GARAGE_SIGN_AUTOVERSION') != '1' else ''} \ | 27 | ${@ d.expand("https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if d.getVar('GARAGE_SIGN_AUTOVERSION') != '1' else ''} \ |
28 | " | 28 | " |
29 | 29 | ||
30 | SRC_URI[garagesign.md5sum] = "de0877ecb693fd48ec11052e51b0ff1a" | 30 | SRC_URI[garagesign.md5sum] = "3d38908f9b536a02cc73778b11bbc32e" |
31 | SRC_URI[garagesign.sha256sum] = "cf25759574c9c1206835daeaf6fc345f6db7b5ccdb95fb828c86d7451f78f0aa" | 31 | SRC_URI[garagesign.sha256sum] = "eceeb16a781e0e8d1f554defbcd5bbcea86d448ebd350fc6a2529372bf867dba" |
32 | 32 | ||
33 | SRCREV = "1c2f495e47a41cc7c9ad969ff42496208ad6b23a" | 33 | SRCREV = "662aa23f0b9c97a2c93a428438dacae72333c751" |
34 | BRANCH ?= "master" | 34 | BRANCH ?= "master" |
35 | 35 | ||
36 | S = "${WORKDIR}/git" | 36 | S = "${WORKDIR}/git" |