Fix correct commit hash for release 0.7.0 of openXC7

[dev-env-setup.git] / symbiflow-install

diff --git a/symbiflow-install b/symbiflow-install
index 5b451c4f4d1e500376d93f017a5e1ce6c69453e7..2527cbcc7ca686683808e8bf06b4f37943e42019 100755 (executable)
--- a/symbiflow-install
+++ b/symbiflow-install
@@ -1,25 +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
-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
@@ -44,6 +31,7 @@ git clone https://github.com/SymbiFlow/python-fpga-interchange.git
 git clone https://github.com/capnproto/capnproto.git
 git clone https://github.com/capnproto/pycapnp.git
 
+# debian/10 libxml2 has an integer overflow error. blech.
 wget http://xmlsoft.org/sources/libxml2-2.9.12.tar.gz
 wget http://xmlsoft.org/sources/libxslt-1.1.34.tar.gz
 
@@ -70,7 +58,7 @@ cd ..
 
 ### Necessary software to install
 
-apt-get install -y cmake
+apt-get -t buster-backports install -y cmake # symbiflow-arch-defs needs newer cmake
 apt-get install -y python3 clang libreadline-dev gawk tcl-dev \
  libffi-dev pkg-config libboost-system-dev libboost-python-dev \
  libboost-filesystem-dev zlib1g-dev
@@ -336,8 +324,8 @@ apt-get install -y nodejs npm python-pytest openocd flake8 python3-numpy \
   python3-typing-extensions python3-ply
 
 pip3 install textx fasm pyjson5 pyyaml tinyfpgab tinyprog pyjson lxml \
-  progressbar2 hilbertcurve==1.0.5 python-constraint parameterized \
-  yapf==0.26.0 python-sat
+  python-utils==3.4.5 progressbar2 hilbertcurve==1.0.5 python-constraint \
+  parameterized yapf==0.26.0 python-sat
 
 cd symbiflow-arch-defs
 git checkout c2c0f00960baf538eb31e4c42bf5d09dca87bad7