From: Emil Velikov <emil.veli...@collabora.com>
Currently we use the python package to manage repositories. At the same
time we also do that by hand - since it's a trivial echo to a file.
Stay consistent, remove the package and manage things manually.
Cc: Eric Engestrom <eric.engest...@intel.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
.gitlab-ci/debian-install.sh | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 578074ddb87..719d7830018 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -16,12 +16,11 @@ apt-get install -y \
curl \
wget \
unzip \
- gnupg \
- software-properties-common
+ gnupg
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-add-apt-repository "deb https://apt.llvm.org/stretch/ llvm-toolchain-stretch-7
main"
-add-apt-repository "deb https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8
main"
+echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-7
main" >/etc/apt/sources.list.d/llvm7.list
+echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8
main" >/etc/apt/sources.list.d/llvm8.list
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
echo 'deb https://deb.debian.org/debian stretch-backports main'
>/etc/apt/sources.list.d/backports.list
@@ -46,8 +45,8 @@ apt-get install -y -t stretch-backports \
clang-8
# Install remaining packages from Debian buster to get newer versions
-add-apt-repository "deb https://deb.debian.org/debian/ buster main"
-add-apt-repository "deb https://deb.debian.org/debian/ buster-updates main"
+echo "deb https://deb.debian.org/debian/ buster main"
>/etc/apt/sources.list.d/buster.list
+echo "deb https://deb.debian.org/debian/ buster-updates main"
>/etc/apt/sources.list.d/buster-updates.list
apt-get update
apt-get install -y \
bzip2 \
--
2.21.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
