Hi, Philipp Kern <[email protected]> writes: > As for poulenc and zemlinsky: I've got an automatic apt-get update > cron'ed that you see. The setup script will only create a sources.buildd.list > which sbuild will use, but will not update the base sources.list in the > chroot. This means that updates and manual dist-upgrades by the buildd > admins will still show up in your logs.
These two seem now to be the only buildds left accessing the old location on ftp-master (and as far as I can see only for apt-get update). Could we also change the security buildds to use the new buildd queues? I've attached a patch that might do the right thing. Please check for any typos, I can't check as I'll just get an access denied anyway. This could go in together with a backported patch for #681292. No need to push the sources.list change earlier. Ansgar
>From 378415005023a5125a3386cc0b5510f0792bc432 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt <[email protected]> Date: Thu, 16 May 2013 18:26:13 +0200 Subject: [PATCH 1/2] etc/99builddsourceslist: update for new security buildd location --- etc/99builddsourceslist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/99builddsourceslist b/etc/99builddsourceslist index b316fcd..71c265b 100755 --- a/etc/99builddsourceslist +++ b/etc/99builddsourceslist @@ -73,7 +73,7 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then domirror "http://ftp.debian.org/debian ${SUITE_BASE} COMPONENT" ${APT_LIST} [ -n "${security_mirror}" ] && domirror "${security_mirror} ${SUITE_BASE} COMPONENT" ${APT_LIST} domirror "http://security-master.debian.org/debian-security ${SUITE_BASE}/updates COMPONENT" ${APT_LIST} - domirror "http://security-master.debian.org/buildd-${SUITE_BASE} /" ${APT_LIST} + domirror "http://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates COMPONENT" ${APT_LIST} elif [ "${SUITE_VARIANT%%-sloppy}" = 'backports' ]; then SUITES="${SUITE_BASE}" @@ -167,8 +167,8 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then fi echo deb http://security-master.debian.org/debian-security ${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} echo deb-src http://security-master.debian.org/debian-security ${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} - echo deb http://security-master.debian.org/buildd-${SUITE_BASE} / >> ${APT_LIST_AUTO} - echo deb-src http://security-master.debian.org/buildd-${SUITE_BASE} / >> ${APT_LIST_AUTO} + echo deb http://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} + echo deb-src http://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} elif [ ${SUITE_VARIANT%%-sloppy} = 'backports' ]; then : > ${APT_LIST_AUTO} if [ -n "${backports_mirror}" ]; then -- 1.7.9.5
>From 1b860ec77fae7a203f3599aef265fa7b7c5117b6 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt <[email protected]> Date: Thu, 16 May 2013 18:27:59 +0200 Subject: [PATCH 2/2] etc/99builddsourceslist: suites on security mirror need /updates --- etc/99builddsourceslist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/99builddsourceslist b/etc/99builddsourceslist index 71c265b..4c4b639 100755 --- a/etc/99builddsourceslist +++ b/etc/99builddsourceslist @@ -71,7 +71,7 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then SUITES="${SUITE_BASE}" [ -n "${debian_mirror}" ] && domirror "${debian_mirror} ${SUITE_BASE} COMPONENT" ${APT_LIST} domirror "http://ftp.debian.org/debian ${SUITE_BASE} COMPONENT" ${APT_LIST} - [ -n "${security_mirror}" ] && domirror "${security_mirror} ${SUITE_BASE} COMPONENT" ${APT_LIST} + [ -n "${security_mirror}" ] && domirror "${security_mirror} ${SUITE_BASE}/updates COMPONENT" ${APT_LIST} domirror "http://security-master.debian.org/debian-security ${SUITE_BASE}/updates COMPONENT" ${APT_LIST} domirror "http://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates COMPONENT" ${APT_LIST} -- 1.7.9.5
