From: Dan Mick <dmick@redhat.com>
Date: Wed, 15 May 2024 19:03:26 +0000 (-0700)
Subject: build_utils.sh: remove pbuilder's --mirror option for Debian
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2238%2Fhead;p=ceph-build.git

build_utils.sh: remove pbuilder's --mirror option for Debian

The existing mirror is defunct, and hard-stopping bookworm builds.
For now, let's just revert to not specifying a mirror (as we have
in the past for other repo configurations) and solve any problems
that result if they pop up.

Signed-off-by: Dan Mick <dmick@redhat.com>
---

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 37e10333..090159f3 100755
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -555,7 +555,11 @@ setup_pbuilder() {
     [ "$DIST" = "jammy" ] && os="ubuntu"
 
     if [ $os = "debian" ]; then
-        mirror="http://www.gtlib.gatech.edu/pub/debian"
+        # this mirror seems to have been decommissioned.  Like other
+        # places where we add specific package mirrors, let's revert
+        # to default (unspecified) for now until we decide there's
+        # a problem we need to address.
+        # mirror="http://www.gtlib.gatech.edu/pub/debian"
         if [ "$DIST" = "jessie" ]; then
           # despite the fact we're building for jessie, pbuilder was failing due to
           # missing wheezy key 8B48AD6246925553.  Pointing pbuilder at the archive
@@ -617,7 +621,9 @@ setup_pbuilder() {
     local opts
     opts+=" --basetgz $basedir/$DIST.tgz"
     opts+=" --distribution $DIST"
-    opts+=" --mirror $mirror"
+    if [ -n "$mirror" ] ; then
+        opts+=" --mirror $mirror"
+    fi
 
     if [ -n "$use_gcc" ]; then
         # Newer pbuilder versions set $HOME to /nonexistent which breaks all kinds of