[26486] in Source-Commits
Re: /svn/athena r25588 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu Jun 28 20:07:43 2012
Date: Thu, 28 Jun 2012 20:07:39 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201206282259.q5SMxHKM017763@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1206282005130.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
On Thu, 28 Jun 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-06-28 18:59:17 -0400 (Thu, 28 Jun 2012)
> New Revision: 25588
>
> Modified:
> trunk/debathena/scripts/build-server/build-all/do-build
> Log:
> - Revert part of r25586 since we don't in fact want to look at the
> psuite's -staging repo
I'm still not sure I fully understand the reasoning, but I'll go with it.
> - Add comments for future generations
Yay!
(I almost made a commit with some comments when I was looking through the
file to think about r255587.)
-Ben
>
>
> Modified: trunk/debathena/scripts/build-server/build-all/do-build
> ===================================================================
> --- trunk/debathena/scripts/build-server/build-all/do-build 2012-06-28 17:01:11 UTC (rev 25587)
> +++ trunk/debathena/scripts/build-server/build-all/do-build 2012-06-28 22:59:17 UTC (rev 25588)
> @@ -6,6 +6,7 @@
> psuite=$4
> : ${DEBATHENA_APT=/mit/debathena/apt}
> : ${DEBATHENA_BUILD_AREA=/afs/sipb.mit.edu/project/debathena/packages}
> +# Release to upload to
> : ${DEBATHENA_RELEASE=-staging}
> export DEBATHENA_RELEASE
> . /mit/debathena/bin/debian-versions.sh
> @@ -20,11 +21,13 @@
> fi
> [ -e "$dir" ]
> cd "$dir"
> +# Skip the package if it's listed in nobuild
> if fgrep -q "$suite" nobuild; then
> touch "$stamp.done"
> trap - EXIT
> exit
> fi
> +# Deal with debathenified packges
> debathenificator=$(echo ./debathenify-*)
> if [ "$debathenificator" != "./debathenify-*" ]; then
> "$debathenificator" "${suite}-amd64" -A source binary upload
> @@ -33,15 +36,21 @@
> trap - EXIT
> exit
> fi
> -for suffix in "" -proposed -development -staging; do
> +# For each of the releases in the previous suite, look for the source
> +# package versions and accept the last one we find. Due to the
> +# current repo layout, this also happens to be the highest version.
> +# We may wish to explicitly select the highest version in the code.
> +for suffix in "" -proposed -development; do
> vv=$(zcat ${DEBATHENA_APT}/dists/$psuite$suffix/*/source/Sources.gz | dpkg-awk -f - "Package:^$package\$" -- Version | sed -n 's/Version: // p')
> if [ -n "$vv" ]; then
> version="$vv"
> fi
> done
> +# Find the .dsc in the built/ directory for the package
> if [ -d "built/" ]; then
> dsc="built/${package}_$version.dsc"
> fi
> +# Build the .dsc if necessary.
> if ! [ -e "$dsc" ]; then
> if ! [ -e "${package}_$version.dsc" ]; then
> schroot -c "${psuite}-amd64-sbuild" -u root -- sh -ec "SBUILD_BUILD_CONF_DISTRIBUTION=$psuite $(readlink -f /mit/debathena/bin/chroot-sources) && apt-get update && apt-get source $package"
>
>