From 5aaee4f7e2c85ef14d20de45f372e2c38e33b311 Mon Sep 17 00:00:00 2001 From: Omkar Chandorkar Date: Mon, 30 Jan 2023 16:30:06 +0530 Subject: [PATCH] !fixup: build: Add support for using vendor_boot as recovery - vendor_boot.img is deleted from $OUT sometimes in the build process - this should allow us to use the image without extracting from target-files Signed-off-by: Omkar Chandorkar --- Dockerfile | 1 + src/build.sh | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8ad81bf..095c31e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,6 +99,7 @@ ENV RECOVERY_IMG false # Assume device does not use vendor_boot as recovery by default ENV VBOOT_IS_RECOVERY false + # Ship with Minimal Apps ENV MINIMAL_APPS false diff --git a/src/build.sh b/src/build.sh index 5a20079..47e5c2b 100755 --- a/src/build.sh +++ b/src/build.sh @@ -323,13 +323,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then RECOVERY_IMG_NAME="recovery-${build%.*}.img" if [ "$VBOOT_IS_RECOVERY" = true ]; then - cp -a vendor_boot.img "$RECOVERY_IMG_NAME" - else - if [ -f "recovery.img" ]; then + 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 + else cp -a boot.img "$RECOVERY_IMG_NAME" - fi fi sha256sum "$RECOVERY_IMG_NAME" > "$RECOVERY_IMG_NAME.sha256sum" -- GitLab