X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=00b405d2da09df48ade1b8d249e135dd6d3c4c19;hb=fbb3ae5f81a68cc3f36c07f8f566c200eda7d458;hp=886da457022bdea76307f204810a02a8ccb0e331;hpb=027a22e17b34244f9d86d2a900d6e813f7a86904;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 886da457..00b405d2 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -36,59 +36,22 @@ function make_buildd_dir () {
     local overridesuite
     local suite
 
+    # We generate straight into the static mirror location for incoming
     dak manage-build-queues -a
     dak generate-packages-sources2 -a build-queues
     dak generate-releases -a build-queues >/dev/null
-    ${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-buildd
 
-    for suite in unstable experimental squeeze-backports; do
-        rm -rf "$incoming/dists/$suite/buildd"
-        mkdir -p "$incoming/dists/$suite/buildd"
-        dak export-suite -s "buildd-$suite" -d "$incoming/dists/$suite/buildd"
-    done
+    # And set up all of the top level symlinks people seem to like
+    find ${incoming}/web -maxdepth 1 -type l -delete
+    dak export-suite -r -s "accepted" -d "$incoming/web"
+
+    # For now, we still create the local incoming.d.o setup
+    ${scriptsdir}/update-buildd-archive ${incoming}/web/debian-buildd ${incoming}/debian-buildd
     rm -f ${incoming}/public/*
     dak export-suite -s "accepted" -d "$incoming/public"
 
-    # export to old build queue directories
-    # XXX: Remove once the buildds use the version generated above.
-    for suite in $(ls -1 $incoming/dists/); do
-        # Skip project trace directory
-        if [ "${suite}x" = "projectx" ]; then continue; fi
-        cd ${incoming}/dists/${suite}/buildd
-
-        overridesuite=sid
-        if [ "${suite}" = "squeeze-backports" ]; then
-            overridesuite="${suite}"
-        fi
-
-        apt-ftparchive packages . $overridedir/override.${overridesuite}.all3 >Packages
-        gzip -9c --rsyncable <Packages >Packages.gz
-        apt-ftparchive sources . $overridedir/override.${overridesuite}.all3 >Sources
-        gzip -9c --rsyncable <Sources >Sources.gz
-
-        rm -f buildd/Release
-        cd ..
-        apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $suite incoming" -o APT::FTPArchive::Release::Architectures="$archs" release buildd >Release
-        if [ "$suite" = "experimental" -o "${suite}" = "squeeze-backports" ]; then
-            echo "NotAutomatic: yes" >>Release
-        fi
-
-        gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o Release.gpg Release
-
-        mv Release Release.gpg buildd/
-    done
-
-    STAMP=${STAMP:-$(date "+%Y%m%d%H%M")}
-
-    for dist in $(ls -1 ${incoming}/dists/); do
-        # Skip project trace directory
-        if [ "${dist}x" = "projectx" ]; then continue; fi
-        cd ${incoming}/dists/${dist}
-        mkdir -p tree/${STAMP}
-        cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/
-        ln -sfT tree/${STAMP} ${incoming}/dists/${dist}/current
-        find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
-    done
+    # Tell the mirrors that we've updated
+    /usr/local/bin/static-update-component incoming.debian.org
 }
 
 # Process (oldstable)-proposed-updates "NEW" queue