From a01230e73ae70a7e8a1b8af673a5ffaa1e183a53 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Wed, 11 Sep 2019 18:35:08 +0200
Subject: [PATCH] gitlab-ci: Use newer packages from backports by default

This is needed in particular to get a recent enough version of meson in
the stretch image, but should be generally beneficial.

Acked-by: Eric Engestrom <eric.engestrom@intel.com>
---
 .gitlab-ci/debian-install.sh         | 9 +++++++++
 .gitlab-ci/debian-stretch-install.sh | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index e77ae132772..5c947b0d042 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -20,6 +20,15 @@ echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources
 
 apt-get update
 
+# Use newer packages from backports by default
+cat >/etc/apt/preferences <<EOF
+Package: *
+Pin: release a=buster-backports
+Pin-Priority: 500
+EOF
+
+apt-get dist-upgrade -y
+
 apt-get install -y --no-remove \
       llvm-6.0-dev \
       libclang-6.0-dev \
diff --git a/.gitlab-ci/debian-stretch-install.sh b/.gitlab-ci/debian-stretch-install.sh
index b9cfa4000b6..906274527b9 100644
--- a/.gitlab-ci/debian-stretch-install.sh
+++ b/.gitlab-ci/debian-stretch-install.sh
@@ -14,6 +14,15 @@ echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/source
 
 apt-get update
 
+# Use newer packages from backports by default
+cat >/etc/apt/preferences <<EOF
+Package: *
+Pin: release a=stretch-backports
+Pin-Priority: 500
+EOF
+
+apt-get dist-upgrade -y
+
 apt-get install -y --no-remove \
       llvm-3.9-dev \
       libclang-3.9-dev \
-- 
2.30.2