From 161513f21328fe1e7a8bd307397bdd2230565639 Mon Sep 17 00:00:00 2001 From: Jackeagle <116548-Jackeagle@users.noreply.gitlab.e.foundation> Date: Tue, 17 Oct 2023 15:04:03 +0000 Subject: [PATCH 1/2] build: If no recovery flag is given, rename recovery file in generic format --- src/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/build.sh b/src/build.sh index 34f127f..37a29c6 100755 --- a/src/build.sh +++ b/src/build.sh @@ -391,9 +391,9 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then if [ "$VBOOT_IS_RECOVERY" = true ]; then cp -a "obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img" "$RECOVERY_IMG_NAME" elif [ -f "recovery.img" ]; then - RECOVERY_IMG_NAME="recovery.img" + cp -a recovery.img "$RECOVERY_IMG_NAME" else - RECOVERY_IMG_NAME="boot.img" + cp -a boot.img "$RECOVERY_IMG_NAME" fi # Calculate sha256sum and move file @@ -478,4 +478,3 @@ fi if [ "$build_successful" = false ] || [ "$sync_successful" = false ]; then exit 1 fi - -- GitLab From 6c4e7288a85ad7bd74931107f7252bcc57ee7aee Mon Sep 17 00:00:00 2001 From: Jackeagle <116548-Jackeagle@users.noreply.gitlab.e.foundation> Date: Tue, 17 Oct 2023 15:25:33 +0000 Subject: [PATCH 2/2] build: fixup!: vboot as recovery command --- src/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build.sh b/src/build.sh index 37a29c6..a634d94 100755 --- a/src/build.sh +++ b/src/build.sh @@ -389,7 +389,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then mv "$RECOVERY_ZIP_NAME"* "$ZIP_DIR/$zipsubdir/" else if [ "$VBOOT_IS_RECOVERY" = true ]; then - cp -a "obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img" "$RECOVERY_IMG_NAME" + cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img "$RECOVERY_IMG_NAME" elif [ -f "recovery.img" ]; then cp -a recovery.img "$RECOVERY_IMG_NAME" else -- GitLab