]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
scripts: add bionic-updates to pbuilderrc for gcc 7.4.0 1432/head
authorAlfredo Deza <adeza@redhat.com>
Wed, 6 Nov 2019 15:20:02 +0000 (10:20 -0500)
committerAlfredo Deza <adeza@redhat.com>
Wed, 6 Nov 2019 16:40:23 +0000 (11:40 -0500)
Fixes: https://tracker.ceph.com/issues/42596
Signed-off-by: Alfredo Deza <adeza@redhat.com>
scripts/build_utils.sh

index 0c8f3753cf44ba72a635e35a80f410b230cb8d6b..d98985a630190333c8506b4bf0979ae07fadf7d9 100644 (file)
@@ -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