From 2c1129d4f02a875f1d2c1b901cc05958c5fb74c6 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Fri, 9 Oct 2020 12:00:52 +0000
Subject: [PATCH 1/5] ALLOW_MISSING_DEPENDENCIES for GSI

---
 src/build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/build.sh b/src/build.sh
index 24bb23d..6531277 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -190,7 +190,9 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
       echo ">> [$(date)] No build for ${DEVICE}"
       continue
     fi
-
+    if [ "${IS_GSI}" = true ]; then
+      export ALLOW_MISSING_DEPENDENCIES=true
+    fi
     # Start the build
     echo ">> [$(date)] Starting build for ${DEVICE}, ${BRANCH_NAME} branch"
     build_successful=false
-- 
GitLab


From 1458bfd8968727b7a648965c3947a349dcc16ca2 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Thu, 15 Oct 2020 10:18:30 +0000
Subject: [PATCH 2/5] BACKUP_SYSTEM_IMG option

---
 src/build.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/build.sh b/src/build.sh
index 6531277..7552929 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -218,6 +218,13 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           sha256sum "IMG-$build" > "IMG-$build.sha256sum"
           md5sum "IMG-$build" > "IMG-$build.md5sum"
         fi
+        if [ "$BACKUP_SYSTEM_IMG" = true ]; then
+          mv obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/system.img ./
+          zip "$ZIP_DIR/$zipsubdir/SYSTEM-$build" system.img
+          cd $ZIP_DIR/$zipsubdir
+          sha256sum "SYSTEM-$build" > "SYSTEM-$build.sha256sum"
+          md5sum "SYSTEM-$build" > "SYSTEM-$build.md5sum"
+        fi
 
 	if [ "$RECOVERY_IMG" = true ]; then
 	  if [ -f "recovery.img" ]; then
-- 
GitLab


From ff7f97c11b2729904b220549b5d57141aadefdd3 Mon Sep 17 00:00:00 2001
From: Phie <phie@phie.ovh>
Date: Mon, 26 Oct 2020 15:27:10 +0100
Subject: [PATCH 3/5] Revert "ALLOW_MISSING_DEPENDENCIES for GSI"

This reverts commit 2c1129d4f02a875f1d2c1b901cc05958c5fb74c6.
---
 src/build.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/build.sh b/src/build.sh
index 7552929..bc170dc 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -190,9 +190,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
       echo ">> [$(date)] No build for ${DEVICE}"
       continue
     fi
-    if [ "${IS_GSI}" = true ]; then
-      export ALLOW_MISSING_DEPENDENCIES=true
-    fi
+
     # Start the build
     echo ">> [$(date)] Starting build for ${DEVICE}, ${BRANCH_NAME} branch"
     build_successful=false
-- 
GitLab


From 4b875f4e3dad10d04765e119f8ec179f0c59e86d Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Mon, 16 Nov 2020 15:08:01 +0000
Subject: [PATCH 4/5] rename BACKUP_SYSTEM_IMG into
 BACKUP_INTERMEDIATE_SYSTEM_IMG

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

diff --git a/src/build.sh b/src/build.sh
index bc170dc..0e5bd1d 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -216,7 +216,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           sha256sum "IMG-$build" > "IMG-$build.sha256sum"
           md5sum "IMG-$build" > "IMG-$build.md5sum"
         fi
-        if [ "$BACKUP_SYSTEM_IMG" = true ]; then
+        if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then
           mv obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/system.img ./
           zip "$ZIP_DIR/$zipsubdir/SYSTEM-$build" system.img
           cd $ZIP_DIR/$zipsubdir
-- 
GitLab


From 12e281bcd8600d24fe12266e80237c1772a76683 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Mon, 16 Nov 2020 15:16:54 +0000
Subject: [PATCH 5/5] adding BACKUP_INTERMEDIATE_SYSTEM_IMG variable

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 617990f..5303fee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -99,6 +99,9 @@ ENV MINIMAL_APPS false
 # Force an eng build even when device name doesn't contain -eng
 ENV ENG_BUILD false
 
+#Save intermediate system.img even when not in out folder
+ENV BACKUP_INTERMEDIATE_SYSTEM_IMG false
+
 
 # You can optionally specify a USERSCRIPTS_DIR volume containing these scripts:
 #  * begin.sh, run at the very beginning
-- 
GitLab