Merge ~paride/ubuntu-seeds/+git/platform:focal into ~ubuntu-core-dev/ubuntu-seeds/+git/platform:focal

[Paride Legovini]

[Paride Legovini (paride)]

Same change already landed in Groovy, see:

https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/platform/commit/?id=fb93501a65eef2e90192d7a16845c6bdee4f99cc

Unmerged commits

d45c0e2... by Paride Legovini on 2020-09-15

seed probert (needed by subiquity)

probert is a dependency of subiquity and should therefore be seeded. The
subiquity snap includes its own copy of probert, so things are not
broken, but we still want all the installer components to be in main for
consistency.

At the moment probert is already in main and not listed as "move to
universe" component-mismatch because probert-network does not exist for
i386, and curtin has a dependency on:

  probert-storage | probert

which keeps probert in main.

This change will make probert-network appear as a component-mismatch as
it is currently not in main. This is correct and will have to be fixed
via a MIR. This will fix LP: #1890301.

diff --git a/STRUCTURE b/STRUCTURE
index 78e47f8..4f96ed2 100644
--- a/STRUCTURE
+++ b/STRUCTURE
@@ -22,10 +22,11 @@ supported-hardware-common: standard
 supported-hardware-desktop: standard
 supported-installer-common: standard installer
 supported-installer-desktop: standard
+supported-installer-server: standard
 supported-network-common: standard
 supported-network-client: standard
 supported-sysadmin-common: standard
 community: community-maas
-supported-server: supported-misc-servers supported-hardware-common supported-installer-common supported-network-common supported-sysadmin-common build-essential supported-development-common supported-kernel-common supported-cloud supported-maas
+supported-server: supported-misc-servers supported-hardware-common supported-installer-common supported-installer-server supported-network-common supported-sysadmin-common build-essential supported-development-common supported-kernel-common supported-cloud supported-maas
 supported-desktop: supported-hardware-desktop supported-installer-desktop supported-hardware-common supported-installer-common supported-network-common supported-network-client supported-sysadmin-common build-essential supported-development-common supported-development-desktop supported-kernel-common supported-kernel-desktop
 supported-common: supported-server supported-desktop 
diff --git a/supported-installer-server b/supported-installer-server
new file mode 100644
index 0000000..ef12be9
--- /dev/null
+++ b/supported-installer-server
@@ -0,0 +1,3 @@
+= Installer =
+
+ * probert # needed by subiquity