Updates to 99builddsourceslist
Hi,
I've prepared some changes to 99builddsourceslist to a, make the same
version work on both Linux and kFreeBSD (and Hurd) again and b, stop
using http://incoming.d.o/debian (which we plan to shut down).
The changes have been tested by Christoph Egger on a kFreeBSD buildd,
but not yet on a Linux buildd.
The patches against the buildd-0.64 branch of sbuild are attached.
Ansgar
>From 97a563f12ef7f5c5a4345c9835862f027bef1b45 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <ansgar@debian.org>
Date: Wed, 13 Aug 2014 18:53:43 +0200
Subject: [PATCH 1/2] 99builddsourceslist: add +([^-])-kfreebsd-*-sbuild*
sid-kfreebsd-amd64-sbuild would be matched by *-*-*-sbuild*, but is
not of the form SUITE-proposed-updates-sbuild*. Adding an extra case
avoids this.
---
etc/99builddsourceslist | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/etc/99builddsourceslist b/etc/99builddsourceslist
index 9b5f755..a1c7791 100755
--- a/etc/99builddsourceslist
+++ b/etc/99builddsourceslist
@@ -21,6 +21,7 @@
#####################################################################
set -e
+shopt -s extglob
[ "$CHROOT_PROFILE" = "buildd" ] || exit 0
@@ -40,17 +41,28 @@ set -e
#
# See bug#718127 for more details.
if ! echo "$CHROOT_DESCRIPTION" | grep -q '(chroot source)' ; then
- case $CHROOT_NAME in
+ CHROOT_ALIAS="${CHROOT_ALIAS/#experimental-/sid-experimental-}"
+ case $CHROOT_ALIAS in
+ +([^-])-+([^-])-@(kfreebsd|hurd)-*-sbuild*)
+ SUITE_BASE=$(echo $CHROOT_ALIAS | cut -f1 -d-)
+ SUITE_VARIANT=$(echo $CHROOT_ALIAS | cut -f2 -d-)
+ ;;
*-*-*-*-sbuild*)
- SUITE_BASE=$(echo $CHROOT_NAME | cut -f1 -d-)
- SUITE_VARIANT=$(echo $CHROOT_NAME | cut -f2,3 -d-)
+ SUITE_BASE=$(echo $CHROOT_ALIAS | cut -f1 -d-)
+ SUITE_VARIANT=$(echo $CHROOT_ALIAS | cut -f2,3 -d-)
+ ;;
+ +([^-])-@(kfreebsd|hurd)-*-sbuild*)
+ SUITE_BASE=$(echo $CHROOT_ALIAS | cut -f1 -d-)
+ if [ ${SUITE_BASE} != "sid" ]; then
+ SUITE_VARIANT="proposed-updates"
+ fi
;;
*-*-*-sbuild*)
- SUITE_BASE=$(echo $CHROOT_NAME | cut -f1 -d-)
- SUITE_VARIANT=$(echo $CHROOT_NAME | cut -f2 -d-)
+ SUITE_BASE=$(echo $CHROOT_ALIAS | cut -f1 -d-)
+ SUITE_VARIANT=$(echo $CHROOT_ALIAS | cut -f2 -d-)
;;
*-*-sbuild*)
- SUITE_BASE=$(echo $CHROOT_NAME | cut -f1 -d-)
+ SUITE_BASE=$(echo $CHROOT_ALIAS | cut -f1 -d-)
if [ ${SUITE_BASE} != "sid" ]; then
SUITE_VARIANT="proposed-updates"
fi
--
2.0.1
>From cab88a3fbde814bc2fa12638b18338a38b8aa41f Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <ansgar@debian.org>
Date: Wed, 13 Aug 2014 17:45:58 +0200
Subject: [PATCH 2/2] 99builddsourceslist: stop using
incoming.debian.org/debian
---
etc/99builddsourceslist | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/etc/99builddsourceslist b/etc/99builddsourceslist
index a1c7791..aabe14d 100755
--- a/etc/99builddsourceslist
+++ b/etc/99builddsourceslist
@@ -102,14 +102,16 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
SUITES="${SUITE_BASE} ${SUITE_BASE}-proposed-updates"
[ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}
domirror "http://ftp.debian.org/debian SUITE COMPONENT" ${APT_LIST}
- [ "${debian_incoming}" != 'no' ] && domirror "http://incoming.debian.org/debian SUITE COMPONENT" ${APT_LIST}
+ if [ "${debian_incoming}" != 'no' ]; then
+ SUITES="${SUITE_BASE}-proposed-updates"
+ domirror "http://incoming.debian.org/debian-buildd buildd-SUITE COMPONENT" ${APT_LIST}
+ fi
elif [ "${SUITE_VARIANT}" = 'lts' ]; then
SUITES="${SUITE_BASE} ${SUITE_BASE}-lts"
[ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}
domirror "http://ftp.debian.org/debian SUITE COMPONENT" ${APT_LIST}
if [ "${debian_incoming}" != 'no' ]; then
- domirror "http://incoming.debian.org/debian SUITE COMPONENT" ${APT_LIST}
SUITES="${SUITE_BASE}-lts"
domirror "http://incoming.debian.org/debian-buildd buildd-SUITE COMPONENT" ${APT_LIST}
fi
@@ -134,11 +136,6 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
domirror "http://backports.debian.org/debian-backports/ SUITE-backports COMPONENT" ${APT_LIST}
fi
if [ "${debian_incoming}" != 'no' ]; then
- if [ "$SUITE" != "squeeze" ]; then
- domirror "http://incoming.debian.org/debian SUITE-backports COMPONENT" ${APT_LIST}
- else
- domirror "http://incoming.debian.org/debian-backports SUITE-backports COMPONENT" ${APT_LIST}
- fi
domirror "http://incoming.debian.org/debian-buildd buildd-SUITE-backports COMPONENT" ${APT_LIST}
fi
if [ "$(echo ${SUITE_VARIANT} | cut -d - -f 2)" = "sloppy" ]; then
@@ -150,11 +147,6 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
domirror "http://backports.debian.org/debian-backports/ SUITE-backports-sloppy COMPONENT" ${APT_LIST}
fi
if [ "${debian_incoming}" != 'no' ]; then
- if [ "$SUITE" != "squeeze" ]; then
- domirror "http://incoming.debian.org/debian SUITE-backports-sloppy COMPONENT" ${APT_LIST}
- else
- domirror "http://incoming.debian.org/debian-backports SUITE-backports-sloppy COMPONENT" ${APT_LIST}
- fi
domirror "http://incoming.debian.org/debian-buildd buildd-SUITE-backports-sloppy COMPONENT" ${APT_LIST}
fi
fi
@@ -174,8 +166,8 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
SUITES="unstable experimental"
fi
[ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}
+ domirror "http://ftp.debian.org/debian SUITE COMPONENT" ${APT_LIST}
if [ "${debian_incoming}" != 'no' ]; then
- domirror "http://incoming.debian.org/debian SUITE COMPONENT" ${APT_LIST}
domirror "http://incoming.debian.org/debian-buildd buildd-SUITE COMPONENT" ${APT_LIST}
fi
--
2.0.1
Reply to: