From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 6 Nov 2019 15:20:02 +0000 (-0500)
Subject: scripts: add bionic-updates to pbuilderrc for gcc 7.4.0
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c2ae64dc5336d9f9ecbe90a04710ff5132adbf13;p=ceph-build.git

scripts: add bionic-updates to pbuilderrc for gcc 7.4.0

Fixes: https://tracker.ceph.com/issues/42596

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 0c8f3753..d98985a6 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -482,6 +482,12 @@ setup_pbuilder() {
     echo "$components" > ~/.pbuilderrc
     echo "$debootstrapopts" >> ~/.pbuilderrc
 
+    # gcc 7.4.0 will come from bionic-updates, those need to be added as well
+    if [ $DIST = "bionic" ]; then
+        other_mirror='OTHERMIRROR="deb $mirror $DIST-updates $components"'
+        echo "$other_mirror" >> ~/.pbuilderrc
+    fi
+
     if [ -n "$use_gcc" ]; then
         # Newer pbuilder versions set $HOME to /nonexistent which breaks all kinds of
         # things that rely on a proper (writable) path. Setting this to the system user's $HOME is not enough