Project

General

Profile

« Previous | Next » 

Revision f152d664

Added by Renato Botelho about 4 years ago

AWS: Add FLAVOR to distfiles.tar

View differences:

tools/builder_common.sh
1748 1748
	fi
1749 1749

  
1750 1750
	if [ "${AWS}" = 1 ] && \
1751
	    aws_exec s3 ls s3://pfsense-engineering-build-pkg/distfiles.tar >/dev/null 2>&1; then
1751
	    aws_exec s3 ls s3://pfsense-engineering-build-pkg/${FLAVOR}-distfiles.tar >/dev/null 2>&1; then
1752 1752
		# Download a copy of the distfiles from S3
1753 1753
		echo ">>> Downloading distfile cache from S3.." | tee -a ${LOGFILE}
1754
		aws_exec s3 cp s3://pfsense-engineering-build-pkg/distfiles.tar . --no-progress
1755
		script -aq ${LOGFILE} tar -xf distfiles.tar -C /usr/ports/distfiles
1754
		aws_exec s3 cp s3://pfsense-engineering-build-pkg/${FLAVOR}-distfiles.tar . --no-progress
1755
		script -aq ${LOGFILE} tar -xf ${FLAVOR}-distfiles.tar -C /usr/ports/distfiles
1756 1756
		# Save a list of distfiles
1757 1757
		find /usr/ports/distfiles > pre-build-distfile-list
1758 1758

  
......
2086 2086
		find /usr/ports/distfiles > post-build-distfile-list
2087 2087
		diff pre-build-distfile-list post-build-distfile-list > /dev/null
2088 2088
		if [ $? -eq 1 ]; then
2089
			rm distfiles.tar
2090
			script -aq ${LOGFILE} tar -cf distfiles.tar -C /usr/ports/distfiles .
2091
			aws_exec s3 cp distfiles.tar s3://pfsense-engineering-build-pkg/ --no-progress
2089
			rm ${FLAVOR}-distfiles.tar
2090
			script -aq ${LOGFILE} tar -cf ${FLAVOR}-distfiles.tar -C /usr/ports/distfiles .
2091
			aws_exec s3 cp ${FLAVOR}-distfiles.tar s3://pfsense-engineering-build-pkg/ --no-progress
2092 2092
		fi
2093 2093
	fi
2094 2094
}

Also available in: Unified diff