yocto: Don't overwrite target with initial compose
The idea of creating the "initial compose" is it should be just that - initial. If we've later added stuff via ostbuild, we don't want to overwrite it. ostbuild will itself recompose from the base.
This commit is contained in:
1 parent
e79209da91
commit
0a428d2bce
1 file changed
+4
-1
@@ -190,7 +190,10 @@ fakeroot do_rootfs () {
|
||||
fi
|
||||
ostree --repo=${repo} commit -s "${IMAGE_LINK_NAME}" --skip-if-unchanged "Build" -b ${base} --tree=tar=${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.gz
|
||||
ostree --repo=${repo} diff "${base}" || true
|
||||
ostree --repo=${repo} compose -s "Initial compose" -b ${buildroot} ${base}:/
|
||||
# Create the initial root if it doesn't exist
|
||||
if ! ostree --repo=${repo} rev-parse "${buildroot}" 2>/dev/null; then
|
||||
ostree --repo=${repo} compose -s "Initial compose" -b ${buildroot} ${base}:/
|
||||
fi
|
||||
}
|
||||
|
||||
log_check() {
|
||||
|
||||
Reference in new issue
Block a user