starlingx
/
root
Code Issues Proposed changes

Fix for ostree in /var/www/pages/feed 

Fixed ostree repo at /var/www/pages/feed in pre-patched isos.

Test Plan:
pass - build iso, install, check ostree repo has a commit

Change-Id: Iba5cc67fc6123e37d28d06ce44ae3b6a950e7217
Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com>
This commit is contained in:
Leonardo Fagundes Luz Serrano 2024-02-16 19:37:22 -03:00
parent 48ad94bac0
commit 434edfeeee
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build-tools/patch-iso-debian
View File

@ -53,14 +53,17 @@ function extract_metadata() {
fi
# Verify if top commit from metadata exist in ostree log
xml_base=$(xmllint --xpath "string(//contents/ostree/commit1/commit)" ${patchesdir}/${patchid}-metadata.xml)
if [[ "$ostree_log" != *"$xml_base"* ]]; then
echo "Error, xml base commit does not exist in ostree log."
echo "patch base: ${xml_base}"
echo "ostree log:"
ostree --repo=${BUILDDIR}/ostree_repo log starlingx
exit 1
fi
#
# TODO: ostree log now only shows the last commit. This verification needs to be done some other way.
#
# xml_base=$(xmllint --xpath "string(//contents/ostree/commit1/commit)" ${patchesdir}/${patchid}-metadata.xml)
# if [[ "$ostree_log" != *"$xml_base"* ]]; then
# echo "Error, xml base commit does not exist in ostree log."
# echo "patch base: ${xml_base}"
# echo "ostree log:"
# ostree --repo=${BUILDDIR}/ostree_repo log starlingx
# exit 1
# fi
}
declare INPUT_ISO=
@ -236,7 +239,7 @@ mkdir -p ${BUILDDIR}/patches
chmod -R +w ${BUILDDIR}/patches
echo "Copying only the latest commit from ostree_repo..."
ostree --repo=${BUILDDIR}/ostree_repo init --mode=archive-z2
# ostree --repo=${BUILDDIR}/ostree_repo init --mode=archive-z2
ostree --repo=${BUILDDIR}/ostree_repo pull-local --depth=0 ${OSTREE_REPO} starlingx
ostree --repo=${BUILDDIR}/ostree_repo summary --update
echo "Updated iso ostree commit:"