Merge "prereqs: Stop depending on python2"

install-prereqs.sh

diff --git a/install-prereqs.sh b/install-prereqs.sh
index cd2206b..9491e84 100755
--- a/install-prereqs.sh
+++ b/install-prereqs.sh
@@ -120,6 +120,7 @@
 function try_install_apt_packages {
     sudo_try apt-get update
     sudo_try apt-get install -y "${APT_PACKAGES[@]}"
+    sed 's/#.*//' ${ROOTDIR}/hw/opentitan-upstream/apt-requirements.txt | sudo_try xargs apt-get install -y
 }
 
 function try_install_python_packages {
@@ -144,6 +145,7 @@
         pip3 install -e .
     popd
 
+    pip3 install -r ${ROOTDIR}/hw/opentitan-upstream/python-requirements.txt
 }
 
 echo "Installing apt package dependencies..."