X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=e44f2bb0e468a86dbd0fec8b7227d1b306c82814;hb=4ba12d4b23d87194df5e415f58608b99ab6fd50a;hp=4469037a71040872d6225fee998694adebda356b;hpb=3b9e191e8737c5b866213b725a70aaf9c1e0e993;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 4469037a..e44f2bb0 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -33,62 +33,16 @@ function wbtrigger() {
 
 # used by cron.dinstall *and* cron.unchecked.
 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
-    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")}
+    # Stick a last modified date in the page footer
+    echo "<p>Last updated: `date -u`</p>" > ${incoming}/web/README.html
 
-    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
+    chronic /usr/local/bin/static-update-component incoming.debian.org
 }
 
 # Process (oldstable)-proposed-updates "NEW" queue
@@ -105,11 +59,11 @@ function punew_do() {
 
     STAMP=${STAMP:-$(date "+%Y%m%d%H%M")}
 
-    local exportdir="${queuedir}${qdir}/tree/${STAMP}"
-    local targetdir="${queuedir}${qdir}/export"
+    local exportdir="${qdir}/tree/${STAMP}"
+    local targetdir="${qdir}/export"
     dak export -q "${queue}" -d "${exportdir}" --all
     ln -sfT ${exportdir} ${targetdir}
-    find ${queuedir}${qdir}/tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
+    find "${qdir}/tree" -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
 }
 
 # These versions used in dinstall
@@ -118,7 +72,7 @@ function punew() {
         log "Doing automated p-u-new processing"
     fi
     cd "${queuedir}/p-u-new"
-    punew_do "$1" "p-u-new" "debian-release@lists.debian.org"
+    punew_do "$1" "${queuedir}/p-u-new" "debian-release@lists.debian.org"
 }
 
 function opunew() {
@@ -126,7 +80,7 @@ function opunew() {
         log "Doing automated o-p-u-new processing"
     fi
     cd "${queuedir}/o-p-u-new"
-    punew_do "$1" "o-p-u-new" "debian-release@lists.debian.org"
+    punew_do "$1" "${queuedir}/o-p-u-new" "debian-release@lists.debian.org"
 }
 
 function backports_policy() {
@@ -195,6 +149,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