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

Commit 739d5667 authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch '7464-master-add-vendor-kernel-boot-partition' into 'master' 

docker: Add support for vendor_kernel_boot images

See merge request !81
parents 0b277de7 087654e4

Dockerfile

+3 −0
Original line number Diff line number Diff line
@@ -118,6 +118,9 @@ ENV RECOVERY_NEEDS_VBMETA_IMG false 
# Assume device does not use super_image for recovery to boot by default.

ENV RECOVERY_NEEDS_SUPER_IMG false



# Assume device does not use vendor_kernel_boot for recovery to boot by default.

ENV RECOVERY_NEEDS_VENDOR_KERNEL_BOOT_IMG false



# Ship with Minimal Apps

ENV MINIMAL_APPS false

Dockerfile.community

+3 −0
Original line number Diff line number Diff line
@@ -126,6 +126,9 @@ ENV RECOVERY_NEEDS_VBMETA_IMG false 
# Assume device does not use super_image for recovery to boot by default.

ENV RECOVERY_NEEDS_SUPER_IMG false



# Assume device does not use vendor_kernel_boot for recovery to boot by default.

ENV RECOVERY_NEEDS_VENDOR_KERNEL_BOOT_IMG false



# Force an eng build even when device name doesn't contain -eng

ENV ENG_BUILD false

src/build.sh

+9 −1
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ 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"

          VENDOR_KERNEL_BOOT_IMG_NAME="vendor_kernel_boot-${build%.*}.img"

          RECOVERY_IMG_NAME="recovery-${build%.*}.img"

          RECOVERY_ZIP_NAME="recovery-IMG-${build%.*}.zip"
@@ -347,6 +348,10 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
                    cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/super_empty.img "$SUPER_EMPTY_IMG_NAME"

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

                fi

                if [ "$RECOVERY_NEEDS_VENDOR_KERNEL_BOOT_IMG" = true ]; then

                    cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_kernel_boot.img "$VENDOR_KERNEL_BOOT_IMG_NAME"

                    sha256sum "$VENDOR_KERNEL_BOOT_IMG_NAME" > "$VENDOR_KERNEL_BOOT_IMG_NAME.sha256sum"

                fi



                if [ "$VBOOT_IS_RECOVERY" = true ]; then

                    cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img "$RECOVERY_IMG_NAME"
@@ -382,7 +387,10 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
                    files_to_zip+=("$SUPER_EMPTY_IMG_NAME")

                    files_to_zip+=("$SUPER_EMPTY_IMG_NAME.sha256sum")

                fi



                if [ "$RECOVERY_NEEDS_VENDOR_KERNEL_BOOT_IMG" = true ]; then

                    files_to_zip+=("$VENDOR_KERNEL_BOOT_IMG_NAME")

                    files_to_zip+=("$VENDOR_KERNEL_BOOT_IMG_NAME.sha256sum")

                fi

                # Zip command

                zip "$RECOVERY_ZIP_NAME" "${files_to_zip[@]}"

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