diff options
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r-- | classes/image_types_ostree.bbclass | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 44a3aa4..41b8d0d 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -1,35 +1,28 @@ | |||
1 | # OSTree deployment | 1 | # OSTree deployment |
2 | 2 | ||
3 | do_image_ostree[depends] += "ostree-native:do_populate_sysroot \ | ||
4 | coreutils-native:do_populate_sysroot \ | ||
5 | virtual/kernel:do_deploy \ | ||
6 | ${INITRAMFS_IMAGE}:do_image_complete \ | ||
7 | " | ||
8 | do_image_ostree[lockfiles] += "${OSTREE_REPO}/ostree.lock" | ||
9 | |||
10 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 3 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
4 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" | ||
11 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" | 5 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" |
12 | OSTREE_COMMIT_BODY ??= "" | 6 | OSTREE_COMMIT_BODY ??= "" |
13 | OSTREE_UPDATE_SUMMARY ??= "0" | 7 | OSTREE_UPDATE_SUMMARY ??= "0" |
14 | 8 | ||
15 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" | 9 | BUILD_OSTREE_TARBALL ??= "1" |
16 | 10 | ||
17 | IMAGE_CMD_ostree () { | 11 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" |
18 | if [ -z "$OSTREE_REPO" ]; then | ||
19 | bbfatal "OSTREE_REPO should be set in your local.conf" | ||
20 | fi | ||
21 | 12 | ||
22 | if [ -z "$OSTREE_BRANCHNAME" ]; then | 13 | IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" |
23 | bbfatal "OSTREE_BRANCHNAME should be set in your local.conf" | 14 | 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 ${OTA_IMAGE_ROOTFS} . || [ $? -eq 1 ]" |
24 | fi | 15 | CONVERSIONTYPES_append = " tar" |
25 | 16 | ||
26 | OSTREE_ROOTFS=`mktemp -du ${WORKDIR}/ostree-root-XXXXX` | 17 | OTA_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" |
27 | cp -a ${IMAGE_ROOTFS} ${OSTREE_ROOTFS} | 18 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" |
19 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" | ||
20 | do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" | ||
21 | IMAGE_CMD_ostree () { | ||
22 | cp -a ${IMAGE_ROOTFS}/* ${OSTREE_ROOTFS} | ||
28 | chmod a+rx ${OSTREE_ROOTFS} | 23 | chmod a+rx ${OSTREE_ROOTFS} |
29 | sync | 24 | sync |
30 | 25 | ||
31 | cd ${OSTREE_ROOTFS} | ||
32 | |||
33 | for d in var/*; do | 26 | for d in var/*; do |
34 | if [ "${d}" != "var/local" ]; then | 27 | if [ "${d}" != "var/local" ]; then |
35 | rm -rf ${d} | 28 | rm -rf ${d} |
@@ -132,17 +125,12 @@ IMAGE_CMD_ostree () { | |||
132 | 125 | ||
133 | # Copy image manifest | 126 | # Copy image manifest |
134 | cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest | 127 | cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest |
128 | } | ||
135 | 129 | ||
136 | cd ${WORKDIR} | 130 | IMAGE_TYPEDEP_ostreecommit = "ostree" |
137 | 131 | do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot" | |
138 | # Create a tarball that can be then commited to OSTree repo | 132 | do_image_ostreecommit[lockfiles] += "${WORKDIR}/${OSTREE_REPO}-commit.lock" |
139 | OSTREE_TAR=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ostree.tar.bz2 | 133 | IMAGE_CMD_ostreecommit () { |
140 | tar -C ${OSTREE_ROOTFS} --xattrs --xattrs-include='*' -cjf ${OSTREE_TAR} . | ||
141 | sync | ||
142 | |||
143 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 | ||
144 | ln -s ${IMAGE_NAME}.rootfs.ostree.tar.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 | ||
145 | |||
146 | if ! ostree --repo=${OSTREE_REPO} refs 2>&1 > /dev/null; then | 134 | if ! ostree --repo=${OSTREE_REPO} refs 2>&1 > /dev/null; then |
147 | ostree --repo=${OSTREE_REPO} init --mode=archive-z2 | 135 | ostree --repo=${OSTREE_REPO} init --mode=archive-z2 |
148 | fi | 136 | fi |
@@ -158,11 +146,9 @@ IMAGE_CMD_ostree () { | |||
158 | if [ "${OSTREE_UPDATE_SUMMARY}" = "1" ]; then | 146 | if [ "${OSTREE_UPDATE_SUMMARY}" = "1" ]; then |
159 | ostree --repo=${OSTREE_REPO} summary -u | 147 | ostree --repo=${OSTREE_REPO} summary -u |
160 | fi | 148 | fi |
161 | |||
162 | rm -rf ${OSTREE_ROOTFS} | ||
163 | } | 149 | } |
164 | 150 | ||
165 | IMAGE_TYPEDEP_ostreepush = "ostree" | 151 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" |
166 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" | 152 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" |
167 | IMAGE_CMD_ostreepush () { | 153 | IMAGE_CMD_ostreepush () { |
168 | # Print warnings if credetials are not set or if the file has not been found. | 154 | # Print warnings if credetials are not set or if the file has not been found. |