Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35ff6240 authored by Jackeagle's avatar Jackeagle
Browse files

build: Revamp RECOVERY_NEEDS_SUPPORT_IMG flag logic 



- Conditionally include vendor_boot.img when RECOVERY_NEEDS_VENDOR_BOOT_IMG is set
- Most OnePlus devices depend on dtbo and vbmeta for recovery to boot up hence having only these files make sense.
- Zip them up with recovery-*.zip so that it looks clean and neat on download page.

Signed-off-by: default avatarJackeagle <jackeagle102@gmail.com>
parent 534a79b2

src/build.sh

+46 −37
Original line number Diff line number Diff line
@@ -324,26 +324,14 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
            SUPER_EMPTY_IMG_NAME="super_empty-${build%.*}.img"

            VBMETA_IMG_NAME="vbmeta-${build%.*}.img"

            VENDOR_BOOT_IMG_NAME="vendor_boot-${build%.*}.img"

            RECOVERY_ZIP_NAME="recovery-IMG-${build%.*}.zip"



            if [ "$RECOVERY_NEEDS_SUPPORT_IMG" = true ]; then

            cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/boot.img "$BOOT_IMG_NAME"

                cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/dtbo.img "$DTBO_IMG_NAME"

            cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/super_empty.img "$SUPER_EMPTY_IMG_NAME"

                cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vbmeta.img "$VBMETA_IMG_NAME"

            sha256sum "$BOOT_IMG_NAME" > "$BOOT_IMG_NAME.sha256sum"

            sha256sum "$DTBO_IMG_NAME" > "$DTBO_IMG_NAME.sha256sum"

            sha256sum "$SUPER_EMPTY_IMG_NAME" > "$SUPER_EMPTY_IMG_NAME.sha256sum"

            sha256sum "$VBMETA_IMG_NAME" > "$VBMETA_IMG_NAME.sha256sum"

            mv "$BOOT_IMG_NAME"* "$ZIP_DIR/$zipsubdir/"

            mv "$DTBO_IMG_NAME"* "$ZIP_DIR/$zipsubdir/"

            mv "$SUPER_EMPTY_IMG_NAME"* "$ZIP_DIR/$zipsubdir/"

            mv "$VBMETA_IMG_NAME"* "$ZIP_DIR/$zipsubdir/"

          fi



                if [ "$RECOVERY_NEEDS_VENDOR_BOOT_IMG" = true ]; then

                    cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img "$VENDOR_BOOT_IMG_NAME"

            sha256sum "$VENDOR_BOOT_IMG_NAME" > "$VENDOR_BOOT_IMG_NAME.sha256sum"

            mv "$VENDOR_BOOT_IMG_NAME"* "$ZIP_DIR/$zipsubdir/"

                fi



                if [ "$VBOOT_IS_RECOVERY" = true ]; then
@@ -354,9 +342,29 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
                    cp -a boot.img "$RECOVERY_IMG_NAME"

                fi



                # Conditionally include vendor_boot.img only when RECOVERY_NEEDS_VENDOR_BOOT_IMG is set.

                if [ "$RECOVERY_NEEDS_VENDOR_BOOT_IMG" = true ]; then

                    zip "$RECOVERY_ZIP_NAME" "$DTBO_IMG_NAME" "$VBMETA_IMG_NAME" $RECOVERY_IMG_NAME "$VENDOR_BOOT_IMG_NAME"

                else

                    zip "$RECOVERY_ZIP_NAME" "$DTBO_IMG_NAME" "$VBMETA_IMG_NAME" $RECOVERY_IMG_NAME

                fi



                sha256sum "$RECOVERY_ZIP_NAME" > "$RECOVERY_ZIP_NAME.sha256sum"

                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"

                elif [ -f "recovery.img" ]; then

                    cp -a recovery.img "$RECOVERY_IMG_NAME"

                else

                    cp -a boot.img "$RECOVERY_IMG_NAME"

                fi



                sha256sum "$RECOVERY_IMG_NAME" > "$RECOVERY_IMG_NAME.sha256sum"

                mv "$RECOVERY_IMG_NAME"* "$ZIP_DIR/$zipsubdir/"

            fi



        fi

      done



      #with only systemimage, we don't have a e-*.zip
@@ -434,3 +442,4 @@ fi 
if [ "$build_successful" = false ] || [ "$sync_successful" = false ]; then

  exit 1

fi