From f0017af4a14b25aa8d7254137f295ca4540d1c97 Mon Sep 17 00:00:00 2001 From: Sumit Pundir Date: Tue, 11 Aug 2020 00:32:01 +0530 Subject: [PATCH 1/2] build: save recovery images Signed-off-by: Sumit Pundir --- Dockerfile | 3 +++ src/build.sh | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/Dockerfile b/Dockerfile index 22f8c63..b5fe416 100644 --- a/Dockerfile +++ b/Dockerfile @@ -100,6 +100,9 @@ ENV DELETE_OLD_LOGS 0 # Requires ZIP_SUBDIR. ENV OPENDELTA_BUILDS_JSON '' +# Save recovery image +ENV RECOVERY_IMG false + # You can optionally specify a USERSCRIPTS_DIR volume containing these scripts: # * begin.sh, run at the very beginning # * before.sh, run after the syncing and patching, before starting the builds diff --git a/src/build.sh b/src/build.sh index 3ce4622..e2001bb 100755 --- a/src/build.sh +++ b/src/build.sh @@ -243,6 +243,14 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then sha256sum "IMG-$build" > "IMG-$build.sha256sum" md5sum "IMG-$build" > "IMG-$build.md5sum" fi + + if [ "$RECOVERY_IMG" = true ]; then + if [ -f "recovery.img" ]; then + cp -a recovery.img "$ZIP_DIR/$zipsubdir/recovery-$build.img" + else + cp -a boot.img "$ZIP_DIR/$zipsubdir/recovery-$build.img" + fi + fi done cd "$source_dir" -- GitLab From d74f9e97c377e6b78e67b76276e3cb721eaed4ed Mon Sep 17 00:00:00 2001 From: Sumit Pundir Date: Tue, 11 Aug 2020 14:45:35 +0530 Subject: [PATCH 2/2] build: refactor recovery image string Signed-off-by: Sumit Pundir --- src/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build.sh b/src/build.sh index e2001bb..323d9c6 100755 --- a/src/build.sh +++ b/src/build.sh @@ -246,9 +246,9 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then if [ "$RECOVERY_IMG" = true ]; then if [ -f "recovery.img" ]; then - cp -a recovery.img "$ZIP_DIR/$zipsubdir/recovery-$build.img" + cp -a recovery.img "$ZIP_DIR/$zipsubdir/recovery-${build%.*}img" else - cp -a boot.img "$ZIP_DIR/$zipsubdir/recovery-$build.img" + cp -a boot.img "$ZIP_DIR/$zipsubdir/recovery-${build%.*}img" fi fi done -- GitLab