From 28cc7a50d03a85adf7485b222f1612e6553d38dc Mon Sep 17 00:00:00 2001
From: Rohit <git@merothh.com>
Date: Fri, 7 Oct 2022 16:58:17 +0530
Subject: [PATCH 1/3] build.sh: $build should not be set to IMG packages

* sha256 is generated inline
---
 src/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/build.sh b/src/build.sh
index c5fbe79..5ee07ea 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -281,7 +281,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
       # Move produced ZIP files to the main OUT directory
       echo ">> [$(date)] Moving build artifacts for ${DEVICE} to '$ZIP_DIR/$zipsubdir'"
       cd "${OUT}" || return 1
-      for build in $(ls e-*.zip IMG-e*.zip); do
+      for build in $(ls e-*.zip); do
         sha256sum "$build" > "$ZIP_DIR/$zipsubdir/$build.sha256sum"
         find . -maxdepth 1 \( -name 'e-*.zip*' -o -name 'IMG-e*.zip*' \) -type f -exec mv {} "$ZIP_DIR/$zipsubdir/" \;
 
-- 
GitLab


From 193cfbce13dc43c948ca039eab17cd9b3d05f6e1 Mon Sep 17 00:00:00 2001
From: Rohit <git@merothh.com>
Date: Fri, 7 Oct 2022 17:05:09 +0530
Subject: [PATCH 2/3] build.sh: mv built QFIL images as well

---
 src/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/build.sh b/src/build.sh
index 5ee07ea..9d40324 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -283,7 +283,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
       cd "${OUT}" || return 1
       for build in $(ls e-*.zip); do
         sha256sum "$build" > "$ZIP_DIR/$zipsubdir/$build.sha256sum"
-        find . -maxdepth 1 \( -name 'e-*.zip*' -o -name 'IMG-e*.zip*' \) -type f -exec mv {} "$ZIP_DIR/$zipsubdir/" \;
+        find . -maxdepth 1 \( -name 'e-*.zip*' -o -name 'IMG-e*.zip*' -o -name 'QFIL-e*.zip*' \) -type f -exec mv {} "$ZIP_DIR/$zipsubdir/" \;
 
         SKIP_DYNAMIC_IMAGES="odm.img product.img system.img system_ext.img vendor.img"
         if [ "$BACKUP_IMG" = true ]; then
-- 
GitLab


From b77fcf9345749769e80dbe0dddc0ea20f4244082 Mon Sep 17 00:00:00 2001
From: Rohit <git@merothh.com>
Date: Fri, 7 Oct 2022 17:18:05 +0530
Subject: [PATCH 3/3] build.sh: Drop EDL_RAW_SUPER_IMAGE

---
 src/build.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/build.sh b/src/build.sh
index 9d40324..dcdf492 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -317,15 +317,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           md5sum "IMG-$build" > "IMG-$build.md5sum"
           cd "${OUT}" || return 1
         fi
-        if [ "$EDL_RAW_SUPER_IMAGE" = true ]; then
-          echo "Unsparsing super image"
-          simg2img super.img super.raw.img || return 1
-          find . -maxdepth 1 -name '*.img' -type f ! -name super.img $(printf "! -name %s " $(echo "$SKIP_DYNAMIC_IMAGES")) -exec zip "$ZIP_DIR/$zipsubdir/EDL-$build" {} \;
-          cd "$ZIP_DIR/$zipsubdir" || return 1
-          sha256sum "EDL-$build" > "EDL-$build.sha256sum"
-          md5sum "EDL-$build" > "EDL-$build.md5sum"
-          cd "${OUT}" || return 1
-        fi
 
       	if [ "$RECOVERY_IMG" = true ]; then
 
-- 
GitLab