From 434edfeeee58bacdd385ecec4cca83f42dade855 Mon Sep 17 00:00:00 2001
From: Leonardo Fagundes Luz Serrano
 <Leonardo.FagundesLuzSerrano@windriver.com>
Date: Fri, 16 Feb 2024 19:37:22 -0300
Subject: [PATCH] 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>
---
 build-tools/patch-iso-debian | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/build-tools/patch-iso-debian b/build-tools/patch-iso-debian
index 93dc782e..82fd8e62 100755
--- a/build-tools/patch-iso-debian
+++ b/build-tools/patch-iso-debian
@@ -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:"