build: Include fixes for murena devices (e9b90d07) · Commits · e / os / docker-lineage-cicd

src/build.sh

+14 −12

Original line number	Diff line number	Diff line
		@@ -343,7 +343,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
		echo ">> [$(date)] Generating fastboot zip from target-files-package"
		img_from_target_files "$OUT/$TARGET_FILES" "$OUT/$FASTBOOT_PACKAGE"

		IMAGES=("recovery" "boot" "vendor_boot" "dtbo" "vbmeta" "vendor_kernel_boot" "super_empty" "system" "odm" "product" "system_ext" "vendor" "vbmeta_system" "super")
		IMAGES=("recovery" "boot" "vendor_boot" "dtbo" "vbmeta" "vbmeta_vendor" "vendor_kernel_boot" "super_empty" "system" "odm" "product" "system_ext" "vendor" "vbmeta_system" "super")

		for i in "${!IMAGES[@]}"; do
		if unzip -l "$OUT/$FASTBOOT_PACKAGE" \| grep -q "${IMAGES[i]}.img"; then
		@@ -355,11 +355,9 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
		IMG_FIRMWARE_PATH="$source_dir/vendor/firmware"
		QFIL_FLASH_PATH="$source_dir/vendor/murena-flash"

		FIRMWARE_CONFIG=$IMG_FIRMWARE_PATH/${DEVICE}/config.mk
		QFIL_CONFIG=$QFIL_FLASH_PATH/${DEVICE}/config.mk
		IMG_CONFIG=$IMG_FLASH_PATH/${DEVICE}/config.mk

		FIRMWARE_IMAGES=$(extract_images "FIRMWARE_IMAGES :=" "$FIRMWARE_CONFIG")
		QFIL_IMAGES=$(extract_images "HLOS_QFIL_TARGET :=" "$QFIL_CONFIG")
		IMG_IMAGES=$(extract_images "HLOS_IMAGES_TARGET :=" "$IMG_CONFIG")

		@@ -370,23 +368,27 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
		build_super_image "$OUT/$TARGET_FILES" "$OUT/super.img"
		fi

		# Create a temp folder for creating IMG-e*
		mkdir -p $OUT/IMG

		if [ -f "$IMG_FLASH_PATH/${DEVICE}/flash_${DEVICE}_factory.sh" ] && [ ! -z "$FIRMWARE_IMAGES" ]; then
		if [[ $IMG_IMAGES =~ "userdata.img" ]]; then
		if echo "$QFIL_IMAGES $IMG_IMAGES" \| grep -q "userdata.img"; then
		mka userdataimage
		fi

		if echo "$QFIL_IMAGES $IMG_IMAGES" \| grep -q "cache.img"; then
		mka cacheimage
		fi

		# Create a temp folder for creating IMG-e*
		mkdir -p $OUT/IMG

		if [ -f "$IMG_FLASH_PATH/${DEVICE}/flash_${DEVICE}_factory.sh" ]; then
		# Copy required images for IMG-e*
		for IMAGE in $IMG_IMAGES; do
		cp $OUT/$IMAGE $OUT/IMG/$IMAGE
		done

		# Copy required images for IMG-e*
		for IMAGE in $FIRMWARE_IMAGES; do
		cp $IMG_FIRMWARE_PATH/${DEVICE}/radio/$IMAGE.img $OUT/IMG/$IMAGE.img
		done
		if [ -d "$IMG_FIRMWARE_PATH/${DEVICE}/radio" ]; then
		cp -rf "$IMG_FIRMWARE_PATH/${DEVICE}/radio/"* $OUT/IMG/
		fi

		# Copy required fastboot tools for IMG-e*
		cp -r $IMG_FLASH_PATH/fastboot/bin-msys $OUT/IMG/bin-msys
		@@ -403,7 +405,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
		cd "$source_dir"
		fi

		if [ -f "$QFIL_FLASH_PATH/${DEVICE}/configs/rawprogram0.xml" ] && [ ! -z "$FIRMWARE_IMAGES" ] && [ ! -z "$QFIL_IMAGES" ]; then
		if [ -f "$QFIL_FLASH_PATH/${DEVICE}/configs/rawprogram0.xml" ] && [ ! -z "$QFIL_IMAGES" ]; then
		# Copy required images for IMG-e*
		for IMAGE in $QFIL_IMAGES; do
		cp $OUT/$IMAGE $OUT/IMG/$IMAGE