X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=5eec32cf93f6cd7167178c750a4869344eee4c45;hb=79bf6f467626829f27ad515d4d4b99b64b6649b0;hp=47cc9b47ef618cbee75ec65a78be69e2c1e582f0;hpb=64b9ab3dcec7f4f5118ae4a254b4aa5abe2c96a0;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 47cc9b47..5eec32cf 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 -depth 0 -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
@@ -195,6 +158,7 @@ function reports() {
     # Send a report on NEW/BYHAND packages
     log "Nagging ftpteam about NEW/BYHAND packages"
     dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+    dak queue-report -d backports-new,backports-policy | mail -a "X-Debian: DAK" -e -s "NEW and POLICY on $(date +%D)" backports-team@debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
     # and one on crufty packages
     log "Sending information about crufty packages"
     dak cruft-report -R > $webdir/cruft-report-daily.txt