From: Ansgar Burchardt Date: Fri, 8 Mar 2013 10:47:50 +0000 (+0100) Subject: config/debian/*: generate old-style buildd archive for squeeze-backports X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b4cde5eb08ce50092f06f51391ff0e28fc12973;p=dak config/debian/*: generate old-style buildd archive for squeeze-backports The suite will be needed until the squeeze-backports buildds switch to the new location. --- diff --git a/config/debian/common b/config/debian/common index 7dcd339b..1e26ed99 100644 --- a/config/debian/common +++ b/config/debian/common @@ -33,12 +33,15 @@ function wbtrigger() { # used by cron.dinstall *and* cron.unchecked. function make_buildd_dir () { + local overridesuite + local suite + 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; do + for suite in unstable experimental squeeze-backports; do rm -rf "$incoming/dists/$suite/buildd" dak export-suite -s "buildd-$suite" -d "$incoming/dists/$suite/buildd" done @@ -52,15 +55,20 @@ function make_buildd_dir () { if [ "${suite}x" = "projectx" ]; then continue; fi cd ${incoming}/dists/${suite}/buildd - apt-ftparchive packages . $overridedir/override.sid.all3 >Packages + overridesuite=sid + if [ "${suite}" = "squeeze-backports" ]; then + overridesuite="${suite}" + fi + + apt-ftparchive packages . $overridedir/override.${overridesuite}.all3 >Packages gzip -9c --rsyncable Packages.gz - apt-ftparchive sources . $overridedir/override.sid.all3 >Sources + apt-ftparchive sources . $overridedir/override.${overridesuite}.all3 >Sources gzip -9c --rsyncable 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" ]; then + if [ "$suite" = "experimental" -o "${suite}" = "squeeze-backports" ]; then echo "NotAutomatic: yes" >>Release fi diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked index 5e819adf..fb5c454a 100755 --- a/config/debian/cron.unchecked +++ b/config/debian/cron.unchecked @@ -63,11 +63,13 @@ function do_buildd () { LOCKDAILY="YES" cd $overridedir dak make-overrides &>/dev/null - rm -f override.sid.all3 override.sid.all3.src + rm -f override.sid.all3 override.sid.all3.src override.squeeze-backports.all3 override.squeeze-backports.all3.src for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3 + cat override.squeeze-backports.$i >> override.squeeze-backports.all3 if [ "$i" != "main.debian-installer" ]; then cat override.sid.$i.src >> override.sid.all3.src + cat override.squeeze-backports.$i.src >> override.squeeze-backports.all3.src fi done make_buildd_dir