diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_types_ostree.bbclass | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 5a17096..e7ff2c4 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" |
9 | do_image_ostree[lockfiles] += "${OSTREE_REPO}/ostree.lock" | ||
9 | 10 | ||
10 | export OSTREE_REPO | 11 | export OSTREE_REPO |
11 | export OSTREE_BRANCHNAME | 12 | export OSTREE_BRANCHNAME |
@@ -122,11 +123,6 @@ IMAGE_CMD_ostree () { | |||
122 | ln -sf var/roothome root | 123 | ln -sf var/roothome root |
123 | fi | 124 | fi |
124 | 125 | ||
125 | if [ -n "${SOTA_SECONDARY_ECUS}" ]; then | ||
126 | mkdir -p var/sota/ecus | ||
127 | cp ${SOTA_SECONDARY_ECUS} var/sota/ecus | ||
128 | fi | ||
129 | |||
130 | # Creating boot directories is required for "ostree admin deploy" | 126 | # Creating boot directories is required for "ostree admin deploy" |
131 | 127 | ||
132 | mkdir -p boot/loader.0 | 128 | mkdir -p boot/loader.0 |
@@ -151,7 +147,7 @@ IMAGE_CMD_ostree () { | |||
151 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 | 147 | rm -f ${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 | 148 | ln -s ${IMAGE_NAME}.rootfs.ostree.tar.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 |
153 | 149 | ||
154 | if [ ! -d ${OSTREE_REPO} ]; then | 150 | if ! ostree --repo=${OSTREE_REPO} refs 2>&1 > /dev/null; then |
155 | ostree --repo=${OSTREE_REPO} init --mode=archive-z2 | 151 | ostree --repo=${OSTREE_REPO} init --mode=archive-z2 |
156 | fi | 152 | fi |
157 | 153 | ||