build: Use old signing method for 12 below (cb3e1a2e) · Commits · e / os / docker-lineage-cicd

build-community.sh

+26 −1

Original line number	Original line	Diff line number	Diff line
	@@ -215,6 +215,12 @@ for branch in ${BRANCH_NAME//,/ }; do
	echo ">> [$(date)] Adding keys path ($KEYS_DIR)"		echo ">> [$(date)] Adding keys path ($KEYS_DIR)"
	# Soong (Android 9+) complains if the signing keys are outside the build path		# Soong (Android 9+) complains if the signing keys are outside the build path
	ln -sf "$KEYS_DIR" user-keys		ln -sf "$KEYS_DIR" user-keys
			if [ "$android_version_major" -lt "10" ]; then
			sed -i "1s;^;PRODUCT_DEFAULT_DEV_CERTIFICATE := user-keys/releasekey\nPRODUCT_OTA_PUBLIC_KEYS := user-keys/releasekey\nPRODUCT_EXTRA_RECOVERY_KEYS := user-keys/releasekey\n\n;" "vendor/$vendor/config/common.mk"
			fi
			if [ "$android_version_major" -lt "12" ]; then
			sed -i "1s;^;PRODUCT_DEFAULT_DEV_CERTIFICATE := user-keys/releasekey\nPRODUCT_OTA_PUBLIC_KEYS := user-keys/releasekey\n\n;" "vendor/$vendor/config/common.mk"
			fi
	fi		fi

	# Remove build number and date on builds.		# Remove build number and date on builds.
	@@ -332,7 +338,26 @@ for branch in ${BRANCH_NAME//,/ }; do
	BRUNCH_DEVICE=lineage_${codename}-eng		BRUNCH_DEVICE=lineage_${codename}-eng
	fi		fi

	if breakfast ${BRUNCH_DEVICE} &>>"$DEBUG_LOG"; then		if [ "$android_version_major" -lt "12" ]; then
			if brunch ${BRUNCH_DEVICE} &>>"$DEBUG_LOG"; then
			currentdate=$(date +%Y%m%d)
			if [ "$builddate" != "$currentdate" ]; then
			find out/target/product/$codename -maxdepth 1 -name "e--$currentdate-.zip*" -type f -exec sh /root/fix_build_date.sh {} $currentdate $builddate \; &>>"$DEBUG_LOG"
			fi

			# Move produced ZIP files to the main OUT directory
			echo ">> [$(date)] Moving build artifacts for $codename to '$ZIP_DIR/$zipsubdir'" \| tee -a "$DEBUG_LOG"
			cd out/target/product/$codename
			for build in e-*.zip; do
			sha256sum "$build" >"$ZIP_DIR/$zipsubdir/$build.sha256sum"
			done
			find . -maxdepth 1 -name 'e-.zip' -type f -exec mv {} "$ZIP_DIR/$zipsubdir/" \; &>>"$DEBUG_LOG"
			cd "$source_dir"
			build_successful=true
			else
			echo ">> [$(date)] Failed build for $codename" \| tee -a "$DEBUG_LOG"
			fi
			elif breakfast ${BRUNCH_DEVICE} &>>"$DEBUG_LOG"; then
	mka target-files-package otatools		mka target-files-package otatools
	echo ">> [$(date)] Starting signing target-files-package"		echo ">> [$(date)] Starting signing target-files-package"

src/build.sh

+38 −16

Original line number	Original line	Diff line number	Diff line
	@@ -189,6 +189,12 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	echo ">> [$(date)] Adding keys path ($KEYS_DIR)"		echo ">> [$(date)] Adding keys path ($KEYS_DIR)"
	# Soong (Android 9+) complains if the signing keys are outside the build path		# Soong (Android 9+) complains if the signing keys are outside the build path
	ln -sf "$KEYS_DIR" user-keys		ln -sf "$KEYS_DIR" user-keys
			if [ "$android_version_major" -lt "10" ]; then
			sed -i "1s;^;PRODUCT_DEFAULT_DEV_CERTIFICATE := user-keys/releasekey\nPRODUCT_OTA_PUBLIC_KEYS := user-keys/releasekey\nPRODUCT_EXTRA_RECOVERY_KEYS := user-keys/releasekey\n\n;" "vendor/$vendor/config/common.mk"
			fi
			if [ "$android_version_major" -lt "12" ]; then
			sed -i "1s;^;PRODUCT_DEFAULT_DEV_CERTIFICATE := user-keys/releasekey\nPRODUCT_OTA_PUBLIC_KEYS := user-keys/releasekey\n\n;" "vendor/$vendor/config/common.mk"
			fi
	fi		fi

	# Remove build number and date on builds.		# Remove build number and date on builds.
	@@ -295,6 +301,14 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	if lunch "${BRUNCH_DEVICE}" && mka sdk_addon; then		if lunch "${BRUNCH_DEVICE}" && mka sdk_addon; then
	build_success=true		build_success=true
	fi		fi
			elif [ "$android_version_major" -lt "12" ]; then
			if [ "${BUILD_SUPER_IMAGE}" = true ]; then
			if breakfast "${BRUNCH_DEVICE}" && mka bacon superimage; then
			build_success=true
			fi
			elif brunch "${BRUNCH_DEVICE}"; then
			build_success=true
			fi
	elif breakfast "${BRUNCH_DEVICE}"; then		elif breakfast "${BRUNCH_DEVICE}"; then
	mka target-files-package otatools		mka target-files-package otatools
	echo ">> [$(date)] Starting signing target-files-package"		echo ">> [$(date)] Starting signing target-files-package"
	@@ -437,10 +451,18 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	find "${OUT}" -maxdepth 1 -name "e--$currentdate-.zip*" -type f -exec sh /root/fix_build_date.sh {} "$currentdate" "$builddate" \;		find "${OUT}" -maxdepth 1 -name "e--$currentdate-.zip*" -type f -exec sh /root/fix_build_date.sh {} "$currentdate" "$builddate" \;
	fi		fi

			IMG_OUT=$OUT
			if [ "$android_version_major" -lt "12" ]; then
			IMG_OUT=obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES
			fi

	# Move produced ZIP files to the main OUT directory		# Move produced ZIP files to the main OUT directory
	echo ">> [$(date)] Moving build artifacts for ${DEVICE} to '$ZIP_DIR/$zipsubdir'"		echo ">> [$(date)] Moving build artifacts for ${DEVICE} to '$ZIP_DIR/$zipsubdir'"
	cd "${OUT}" \|\| return 1		cd "${OUT}" \|\| return 1
	for build in $(ls e-*.zip); do		for build in $(ls e-*.zip); do
			if [ "$android_version_major" -lt "12" ]; then
			sha256sum "$build" >"$ZIP_DIR/$zipsubdir/$build.sha256sum"
			fi
	find . -maxdepth 1 $ -name 'e-.zip' -o -name 'IMG-e.zip' -o -name 'QFIL-e.zip' $ -type f -exec mv {} "$ZIP_DIR/$zipsubdir/" \;		find . -maxdepth 1 $ -name 'e-.zip' -o -name 'IMG-e.zip' -o -name 'QFIL-e.zip' $ -type f -exec mv {} "$ZIP_DIR/$zipsubdir/" \;

	SKIP_DYNAMIC_IMAGES="odm.img product.img system.img system_ext.img vendor.img"		SKIP_DYNAMIC_IMAGES="odm.img product.img system.img system_ext.img vendor.img"
	@@ -468,7 +490,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	cd "${OUT}" \|\| return 1		cd "${OUT}" \|\| return 1
	fi		fi
	if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then		if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then
	mv $OUT/system.img ./		mv $IMG_OUT/system.img ./
	zip "$ZIP_DIR/$zipsubdir/IMG-$build" system.img		zip "$ZIP_DIR/$zipsubdir/IMG-$build" system.img
	cd $ZIP_DIR/$zipsubdir		cd $ZIP_DIR/$zipsubdir
	sha256sum "IMG-$build" >"IMG-$build.sha256sum"		sha256sum "IMG-$build" >"IMG-$build.sha256sum"
	@@ -489,36 +511,36 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	if [ "$RECOVERY_NEEDS_SUPPORT_IMG" = true ]; then		if [ "$RECOVERY_NEEDS_SUPPORT_IMG" = true ]; then
	# Copy the files specified by the flags		# Copy the files specified by the flags
	if [ "$RECOVERY_NEEDS_BOOT_IMG" = true ]; then		if [ "$RECOVERY_NEEDS_BOOT_IMG" = true ]; then
	mv $OUT/boot.img "$BOOT_IMG_NAME"		cp -a $IMG_OUT/boot.img "$BOOT_IMG_NAME"
	sha256sum "$BOOT_IMG_NAME" >"$BOOT_IMG_NAME.sha256sum"		sha256sum "$BOOT_IMG_NAME" >"$BOOT_IMG_NAME.sha256sum"
	fi		fi
	if [ "$RECOVERY_NEEDS_DTBO_IMG" = true ]; then		if [ "$RECOVERY_NEEDS_DTBO_IMG" = true ]; then
	cmv $OUT/dtbo.img "$DTBO_IMG_NAME"		cp -a $IMG_OUT/dtbo.img "$DTBO_IMG_NAME"
	sha256sum "$DTBO_IMG_NAME" >"$DTBO_IMG_NAME.sha256sum"		sha256sum "$DTBO_IMG_NAME" >"$DTBO_IMG_NAME.sha256sum"
	fi		fi
	if [ "$RECOVERY_NEEDS_VBMETA_IMG" = true ]; then		if [ "$RECOVERY_NEEDS_VBMETA_IMG" = true ]; then
	mv $OUT/vbmeta.img "$VBMETA_IMG_NAME"		cp -a $IMG_OUT/vbmeta.img "$VBMETA_IMG_NAME"
	sha256sum "$VBMETA_IMG_NAME" >"$VBMETA_IMG_NAME.sha256sum"		sha256sum "$VBMETA_IMG_NAME" >"$VBMETA_IMG_NAME.sha256sum"
	fi		fi
	if [ "$RECOVERY_NEEDS_VENDOR_BOOT_IMG" = true ]; then		if [ "$RECOVERY_NEEDS_VENDOR_BOOT_IMG" = true ]; then
	mv $OUT/vendor_boot.img "$VENDOR_BOOT_IMG_NAME"		cp -a $IMG_OUT/vendor_boot.img "$VENDOR_BOOT_IMG_NAME"
	sha256sum "$VENDOR_BOOT_IMG_NAME" >"$VENDOR_BOOT_IMG_NAME.sha256sum"		sha256sum "$VENDOR_BOOT_IMG_NAME" >"$VENDOR_BOOT_IMG_NAME.sha256sum"
	fi		fi
	if [ "$RECOVERY_NEEDS_SUPER_IMG" = true ]; then		if [ "$RECOVERY_NEEDS_SUPER_IMG" = true ]; then
	mv $OUT/super_empty.img "$SUPER_EMPTY_IMG_NAME"		cp -a $IMG_OUT/super_empty.img "$SUPER_EMPTY_IMG_NAME"
	sha256sum "$SUPER_EMPTY_IMG_NAME" >"$SUPER_EMPTY_IMG_NAME.sha256sum"		sha256sum "$SUPER_EMPTY_IMG_NAME" >"$SUPER_EMPTY_IMG_NAME.sha256sum"
	fi		fi
	if [ "$RECOVERY_NEEDS_VENDOR_KERNEL_BOOT_IMG" = true ]; then		if [ "$RECOVERY_NEEDS_VENDOR_KERNEL_BOOT_IMG" = true ]; then
	mv $OUT/vendor_kernel_boot.img "$VENDOR_KERNEL_BOOT_IMG_NAME"		cp -a $IMG_OUT/vendor_kernel_boot.img "$VENDOR_KERNEL_BOOT_IMG_NAME"
	sha256sum "$VENDOR_KERNEL_BOOT_IMG_NAME" >"$VENDOR_KERNEL_BOOT_IMG_NAME.sha256sum"		sha256sum "$VENDOR_KERNEL_BOOT_IMG_NAME" >"$VENDOR_KERNEL_BOOT_IMG_NAME.sha256sum"
	fi		fi

	if [ "$VBOOT_IS_RECOVERY" = true ]; then		if [ "$VBOOT_IS_RECOVERY" = true ]; then
	mv $OUT/vendor_boot.img "$RECOVERY_IMG_NAME"		cp -a $IMG_OUT/vendor_boot.img "$RECOVERY_IMG_NAME"
	elif [ -f "recovery.img" ]; then		elif [ -f "$IMG_OUT/recovery.img" ]; then
	mv $OUT/recovery.img "$RECOVERY_IMG_NAME"		cp -a $IMG_OUT/recovery.img "$RECOVERY_IMG_NAME"
	else		else
	mv $OUT/boot.img "$RECOVERY_IMG_NAME"		cp -a $IMG_OUT/boot.img "$RECOVERY_IMG_NAME"
	fi		fi

	# Generate SHA256 checksum for RECOVERY_IMG_NAME		# Generate SHA256 checksum for RECOVERY_IMG_NAME
	@@ -557,11 +579,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	mv "$RECOVERY_ZIP_NAME"* "$ZIP_DIR/$zipsubdir/"		mv "$RECOVERY_ZIP_NAME"* "$ZIP_DIR/$zipsubdir/"
	else		else
	if [ "$VBOOT_IS_RECOVERY" = true ]; then		if [ "$VBOOT_IS_RECOVERY" = true ]; then
	mv $OUT/vendor_boot.img "$RECOVERY_IMG_NAME"		cp -a $IMG_OUT/vendor_boot.img "$RECOVERY_IMG_NAME"
	elif [ -f "recovery.img" ]; then		elif [ -f "$IMG_OUT/recovery.img" ]; then
	mv $OUT/recovery.img "$RECOVERY_IMG_NAME"		cp -a $IMG_OUT/recovery.img "$RECOVERY_IMG_NAME"
	else		else
	mv $OUT/boot.img "$RECOVERY_IMG_NAME"		cp -a $IMG_OUT/boot.img "$RECOVERY_IMG_NAME"
	fi		fi

	# Calculate sha256sum and move file		# Calculate sha256sum and move file
	@@ -575,7 +597,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	if [ "${BUILD_ONLY_SYSTEMIMAGE}" = true ]; then		if [ "${BUILD_ONLY_SYSTEMIMAGE}" = true ]; then
	build=e-$(grep lineage.version system/build.prop \| sed s/#.// \| sed s/.=// \| tr -d \n).zip		build=e-$(grep lineage.version system/build.prop \| sed s/#.// \| sed s/.=// \| tr -d \n).zip
	if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then		if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then
	mv $OUT/system.img ./		mv $IMG_OUT/system.img ./
	zip "$ZIP_DIR/$zipsubdir/IMG-$build" system.img		zip "$ZIP_DIR/$zipsubdir/IMG-$build" system.img
	cd $ZIP_DIR/$zipsubdir		cd $ZIP_DIR/$zipsubdir
	sha256sum "IMG-$build" >"IMG-$build.sha256sum"		sha256sum "IMG-$build" >"IMG-$build.sha256sum"