From 9f25fd36ea9cef49c01c40e90f7a783dfc73c8e8 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Sun, 4 Nov 2012 14:37:24 +0100 Subject: [PATCH] config/debian-security/*: More updates for multiarchive changes. --- config/debian-security/cron.unchecked | 30 +++++++++++++++++++++++++++ config/debian-security/map.sh | 2 +- config/debian-security/vars | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked index ba1e5751..c7baa6e6 100755 --- a/config/debian-security/cron.unchecked +++ b/config/debian-security/cron.unchecked @@ -69,7 +69,37 @@ if [ "${doanything}" = "false" ] && [ "${dopolicy}" = "false" ]; then exit 0 fi +# manage build queues dak manage-build-queues -a +dak generate-packages-sources2 -a build-queues +dak generate-releases -a build-queues >/dev/null + +# export build queues in old format +# XXX: This should be removed later. +for suite in stable testing; do + overridecodename=$(dak admin suite show ${suite} | awk '$1 == "OverrideCodename:" { print $2 }') + rm -rf ${incoming}/${suite}.new + dak export-suite -s buildd-${suite} -d ${incoming}/${suite}.new + + cd ${incoming}/${suite}.new + apt-ftparchive packages . ${overridedir}/override.${overridecodename}.all3 >Packages + gzip -9c --rsyncable Packages.gz + apt-ftparchive sources . ${overridedir}/override.${overridecodename}.all3.src >Sources + gzip -9c --rsyncable Sources.gz + rm -f Release + + cd ${incoming} + 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 ${suite}.new >${suite}.Release + + gpg --secret-keyring /srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg /srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o ${suite}.Release.gpg ${suite}.Release + + mv ${suite}.Release ${suite}.new/Release + mv ${suite}.Release.gpg ${suite}.new/Release.gpg + + mv ${suite} ${suite}.old + mv ${suite}.new ${suite} + rm -rf ${suite}.old +done if [ "x${dopolicy}x" = "xtruex" ]; then # We had something approved from a policy queue, push out new archive diff --git a/config/debian-security/map.sh b/config/debian-security/map.sh index 06cd5384..caa80b9c 100755 --- a/config/debian-security/map.sh +++ b/config/debian-security/map.sh @@ -1,3 +1,3 @@ #!/bin/bash -dak make-pkg-file-mapping | bzip2 -9 > /srv/security-master.debian.org/ftp/indices/package-file.map.bz2 +dak make-pkg-file-mapping security | bzip2 -9 > /srv/security-master.debian.org/ftp/indices/package-file.map.bz2 diff --git a/config/debian-security/vars b/config/debian-security/vars index 2d040a91..2a94fcd1 100644 --- a/config/debian-security/vars +++ b/config/debian-security/vars @@ -26,6 +26,7 @@ disembargo=$queuedir/unchecked-disembargo/ done=$queuedir/done/ mirrordir=$base/mirror/ +incoming=${base}/buildd exportdir=$base/export/ exportpublic=$public/rsync/export/ -- 2.39.5