Focal update

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Change-Id: Ied15af3f096366e4b0e41054e737645ecde24cc2

3 files changed, 14 insertions, 42 deletions

diff --git a/STG.prj b/STG.prj
index e628a21..bd8a770 100644
--- a/STG.prj
+++ b/STG.prj
@@ -17,20 +17,14 @@
     <arch>armv7hl</arch>
     <arch>x86_64</arch>
   </repository>
-  <repository name="buster">
-    <path project="Debian:10.0" repository="main"/>
-    <arch>aarch64</arch>
-    <arch>armv7hl</arch>
-    <arch>x86_64</arch>
-  </repository>
-  <repository name="stretch">
-    <path project="Debian:9.0" repository="main"/>
+  <repository name="focal">
+    <path project="Ubuntu:20.04" repository="universe"/>
     <arch>aarch64</arch>
     <arch>armv7hl</arch>
     <arch>x86_64</arch>
   </repository>
-  <repository name="trusty">
-    <path project="Ubuntu:14.04" repository="universe"/>
+  <repository name="buster">
+    <path project="Debian:10.0" repository="main"/>
     <arch>aarch64</arch>
     <arch>armv7hl</arch>
     <arch>x86_64</arch>
diff --git a/Ubuntu:20.04.prjconf b/Ubuntu:20.04.prjconf
index 7ab48fe..e1568bd 100644
--- a/Ubuntu:20.04.prjconf
+++ b/Ubuntu:20.04.prjconf
@@ -1,13 +1,16 @@
 
 Repotype: debian
 
-ExpandFlags: preinstallexpand
-Preinstall: init-system-helpers debianutils dpkg libc-bin dash coreutils diffutils findutils
-Preinstall: sed gawk grep gzip debconf bash base-files base-passwd perl-modules-5.30 libperl5.30
-Preinstall: util-linux
-Preinstall: xz-utils passwd
-
-Support: init-system-helpers
+Preinstall: bash perl-base perl-modules-5.30 libperl5.30 sed grep coreutils debianutils
+Preinstall: libc6 libncurses5 libacl1 libattr1 libpcre2-8-0 perl linux-libc-dev
+Preinstall: libreadline8 tar gawk dpkg libc-bin libzstd1
+Preinstall: gzip base-files base-passwd libaudit1 libaudit-common
+Preinstall: readline-common libselinux1 libsepol1
+Preinstall: libgcc1 util-linux debconf tzdata findutils libdbus-1-3
+Preinstall: liblzma5 xz-utils libstdc++6 passwd libcrypt1
+Preinstall: login zlib1g libbz2-1.0 libtinfo6
+Preinstall: dash libmpfr6 libgmp10 libdebconfclient0
+Preinstall: diffutils init-system-helpers
 
 Order: libc6:libc-bin
 Order: base-files:screen
@@ -29,27 +32,6 @@ Prefer: dracut
 Prefer: -libelogind0
 Prefer: devscripts:fakeroot
 
-# Experimental: testing OBS snapcraft support, adrian
-Substitute: snapcraft-plugin:ant snapcraft apt ant
-Substitute: snapcraft-plugin:autotools snapcraft apt autoconf automake autopoint libtool make
-Substitute: snapcraft-plugin:catkin snapcraft apt
-Substitute: snapcraft-plugin:cmake snapcraft apt cmake
-Substitute: snapcraft-plugin:copy snapcraft apt
-Substitute: snapcraft-plugin:go snapcraft apt golang-go
-Substitute: snapcraft-plugin:gulp snapcraft apt
-Substitute: snapcraft-plugin:jdk snapcraft apt default-jdk
-Substitute: snapcraft-plugin:kbuild snapcraft apt make
-Substitute: snapcraft-plugin:kernel snapcraft apt
-Substitute: snapcraft-plugin:make snapcraft apt make
-Substitute: snapcraft-plugin:maven MAVEN_PLUGIN_IS_NOT_SUPPORTED_IN_OBS
-Substitute: snapcraft-plugin:nil snapcraft apt
-Substitute: snapcraft-plugin:nodejs snapcraft apt
-Substitute: snapcraft-plugin:python2 snapcraft apt python-dev python-pkg-resources python-setuptools
-Substitute: snapcraft-plugin:python3 snapcraft apt python3-dev python3-pkg-resources python3-setuptools
-Substitute: snapcraft-plugin:qmake snapcraft apt make qt5-qmake qtbase5-dev qt4-qmake libqt4-dev
-Substitute: snapcraft-plugin:scons snapcraft apt scons
-Substitute: snapcraft-plugin:tar_content snapcraft apt
-
 Prefer: -sudo-ldap -make-guile -pkgconf -lubuntu-icon-theme
 
 Required: autoconf automake binutils bzip2 gcc gettext libc6
diff --git a/optee.prj b/optee.prj
index 54f52ee..6bfcdd6 100644
--- a/optee.prj
+++ b/optee.prj
@@ -18,10 +18,6 @@
     <path project="Ubuntu:16.04" repository="universe"/>
     <arch>aarch64</arch>
   </repository>
-  <repository name="Debian_8">
-    <path project="Debian:8" repository="main"/>
-    <arch>aarch64</arch>
-  </repository>
   <repository name="Debian_9">
     <path project="Debian:9.0" repository="main"/>
     <arch>aarch64</arch>