From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 14 Jul 2022 11:02:19 +0000 (+0100)
Subject: adapt devscripts to only do buster-backports once
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b7055237df1dbe07370c41cea43d7d78e2bd21a3;p=dev-env-setup.git

adapt devscripts to only do buster-backports once
---

diff --git a/coriolis-install b/coriolis-install
index acf757c..d148371 100755
--- a/coriolis-install
+++ b/coriolis-install
@@ -11,7 +11,6 @@ echo "Current USER=$USER"
 # Install apt dependencies
 echo Installing necessary apt dependencies in the chroot
 sudo apt-get update -y
-sudo apt-get upgrade -y
 sudo apt-get install -y automake binutils-dev bison build-essential \
 	sysvinit-utils sysvinit-core \
 	ccache clang cmake doxygen dvipng flex gcc git graphviz \
diff --git a/install-firmware-apt-reqs b/install-firmware-apt-reqs
index 1088957..ef7ec4f 100755
--- a/install-firmware-apt-reqs
+++ b/install-firmware-apt-reqs
@@ -1,24 +1,12 @@
 #!/bin/bash
 #
 # Relies on install-hdl-apt-reqs being run first
+# which has already added buster-backports (and pinned libcurl3-gnutls, sigh)
 
 if [ "$EUID" -ne 0 ]
   then echo "Please run as root"
   exit
-fi
-# for qemu 5.2 use debian/buster backports
-cat << EOF > /etc/apt/sources.list.d/buster_backports.list
-deb http://deb.debian.org/debian buster-backports main
-EOF
-
-# oooo annoying, pin preferences for buster-backports
-cat << EOF > /etc/apt/preferences.d/99buster-backports
-Package: *
-Pin: release a=buster-backports
-Pin-Priority: 900
-EOF
 
 apt-get update -y
-apt-get upgrade -y
 apt-get install -y python3-pykwalify \
 	python3-pyelftools
diff --git a/install-hdl-apt-reqs b/install-hdl-apt-reqs
index ba24ee9..a7d82fe 100755
--- a/install-hdl-apt-reqs
+++ b/install-hdl-apt-reqs
@@ -3,24 +3,7 @@ if [ "$EUID" -ne 0 ]
   then echo "Please run as root"
   exit
 fi
-# for qemu 5.2 use debian/buster backports
-cat << EOF > /etc/apt/sources.list.d/buster_backports.list
-deb http://deb.debian.org/debian buster-backports main
-EOF
-
-# oooo annoying, pin preferences for buster-backports
-cat << EOF > /etc/apt/preferences.d/99buster-backports
-Package: *
-Pin: release a=buster-backports
-Pin-Priority: 900
-
-Package: libcurl3-gnutls
-Pin: release a=stable
-Pin-Priority: 901
-EOF
-
 apt-get update -y
-apt-get upgrade -y
 apt-get install -y autoconf \
     bison \
     build-essential \
diff --git a/install-mesa-apt-reqs b/install-mesa-apt-reqs
index 169ca51..9777f3e 100755
--- a/install-mesa-apt-reqs
+++ b/install-mesa-apt-reqs
@@ -1,12 +1,12 @@
 #!/bin/bash
+# Relies on mk-deb-chroot adding buster-backports
+
 if [ "$EUID" -ne 0 ]
   then echo "Please run as root"
   exit
 fi
-echo "deb http://deb.debian.org/debian buster-backports main" | tee \
-    -a /etc/apt/sources.list
+
 apt-get update -y
-apt-get upgrade -y
 apt-get install -y build-essential \
     cmake \
     git \
diff --git a/mk-deb-chroot b/mk-deb-chroot
index 3d43fef..b68e755 100755
--- a/mk-deb-chroot
+++ b/mk-deb-chroot
@@ -109,6 +109,22 @@ This enables you to chroot into $chrootdir as an unprivileged user by running
 "
 fi
 
+#!!! buster backports is needed for a lot of things
+cat << EOF > /opt/chroot/$chrootdir/etc/apt/sources.list.d/buster_backports.list
+deb http://deb.debian.org/debian buster-backports main
+EOF
+
+# oooo annoying, pin preferences for buster-backports
+cat << EOF > /opt/chroot/$chrootdir/etc/apt/preferences.d/99buster-backports
+Package: *
+Pin: release a=buster-backports
+Pin-Priority: 900
+
+Package: libcurl3-gnutls:amd64
+Pin: release a=stable
+Pin-Priority: 901
+EOF
+
 # Install apt dependencies in the chroot
 cd /tmp
 schroot -c $chrootdir /bin/bash --directory=/tmp << EOF
diff --git a/symbiflow-install b/symbiflow-install
index d537fb6..71a0249 100755
--- a/symbiflow-install
+++ b/symbiflow-install
@@ -1,29 +1,12 @@
 #!/bin/bash
+# Relies on install-hdl-apt-reqs being run first
+# which has already added buster-backports (and pinned libcurl3-gnutls, sigh)
+
 if [ "$EUID" -ne 0 ]
   then echo "Please run as root using 'sudo bash'"
   exit
 fi
 
-#!!! buster backports is needed for cmake
-cat << EOF > /etc/apt/sources.list.d/buster_backports.list
-deb http://deb.debian.org/debian buster-backports main
-EOF
-
-# oooo annoying, pin preferences for buster-backports
-cat << EOF > /etc/apt/preferences.d/99buster-backports
-Package: *
-Pin: release a=buster-backports
-Pin-Priority: 900
-
-Package: libcurl3-gnutls:amd64
-Pin: release a=stable
-Pin-Priority: 901
-EOF
-
-# upgrade to buster-backports
-apt-get update -y
-apt-get upgrade -y
-
 # change into $SUDO_USER home directory
 cd /home/$SUDO_USER
 mkdir -p src/symbiflow