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.bbclass8
1 files changed, 2 insertions, 6 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 819cc6d..4bcfc9b 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -6,6 +6,7 @@ do_image_ostree[depends] += "ostree-native:do_populate_sysroot \
6 unzip-native:do_populate_sysroot \ 6 unzip-native:do_populate_sysroot \
7 virtual/kernel:do_deploy \ 7 virtual/kernel:do_deploy \
8 ${OSTREE_INITRAMFS_IMAGE}:do_image_complete" 8 ${OSTREE_INITRAMFS_IMAGE}:do_image_complete"
9do_image_ostree[lockfiles] += "${OSTREE_REPO}/ostree.lock"
9 10
10export OSTREE_REPO 11export OSTREE_REPO
11export OSTREE_BRANCHNAME 12export OSTREE_BRANCHNAME
@@ -126,11 +127,6 @@ IMAGE_CMD_ostree () {
126 ln -sf var/roothome root 127 ln -sf var/roothome root
127 fi 128 fi
128 129
129 if [ -n "${SOTA_SECONDARY_ECUS}" ]; then
130 mkdir -p var/sota/ecus
131 cp ${SOTA_SECONDARY_ECUS} var/sota/ecus
132 fi
133
134 # Creating boot directories is required for "ostree admin deploy" 130 # Creating boot directories is required for "ostree admin deploy"
135 131
136 mkdir -p boot/loader.0 132 mkdir -p boot/loader.0
@@ -155,7 +151,7 @@ IMAGE_CMD_ostree () {
155 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 151 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2
156 ln -s ${IMAGE_NAME}.rootfs.ostree.tar.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 152 ln -s ${IMAGE_NAME}.rootfs.ostree.tar.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2
157 153
158 if [ ! -d ${OSTREE_REPO} ]; then 154 if ! ostree --repo=${OSTREE_REPO} refs 2>&1 > /dev/null; then
159 ostree --repo=${OSTREE_REPO} init --mode=archive-z2 155 ostree --repo=${OSTREE_REPO} init --mode=archive-z2
160 fi 156 fi
161 157