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

Commit 9ee9342f authored by Omkar Chandorkar's avatar Omkar Chandorkar
Browse files

Merge branch '276devices-s-vbootrecovery-fixup' into 'master' 

!fixup: build: Add support for using vendor_boot as recovery

See merge request !62
parents 63ee01ad 5aaee4f7

Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -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

src/build.sh

+3 −5
Original line number Diff line number Diff line
@@ -323,14 +323,12 @@ 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

              cp -a boot.img "$RECOVERY_IMG_NAME"

          fi

          fi



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

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