Igor Brovtsin has proposed merging maas-images:platform-support into 
maas-images:master.

Commit message:
Platform support

Requested reviews:
  maintainers of maas images (maas-images-maintainers)

For more details, see:
https://code.launchpad.net/~maas-images-maintainers/maas-images/+git/maas-images/+merge/441874

This MP introduces additional fields to the manifest. Most likely breaks v2 
manifest.
-- 
Your team maintainers of maas images is requested to review the proposed merge 
of maas-images:platform-support into maas-images:master.
diff --git a/conf/meph-v3.yaml b/conf/meph-v3.yaml
index 4214e98..882c611 100644
--- a/conf/meph-v3.yaml
+++ b/conf/meph-v3.yaml
@@ -68,234 +68,243 @@ misc:
                di-format: 'xgene', dtb: 'apm-mustang.dtb'}
  - &kh-xgene   {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
 
+supported_platforms:
+ - &sp_generic [nvidia, nvidia-dgx]
+ - &sp_generic_arm [highbank, nvidia, nvidia-dgx]
+ - &sp_nvidia [nvidia, nvidia-dgx]
+ - &sp_xgene []
+ - &sp_mustang []
+ - &sp_highbank []
+ - &sp_lpae []
+
 releases:
  - version: "23.04"
    release: lunar
    kernels:
-    - [lunar,       amd64,    ga-23.04,        generic,     linux-generic,                        *sa_hwe_ll]
-    - [lunar,       amd64,    ga-23.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_ll]
-    - [lunar,       arm64,    ga-23.04,        generic,     linux-generic,                        *sa_hwe_ll]
-    - [lunar,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [lunar,       armhf,    ga-23.04,        generic,     linux-generic,                        *arm_hwe_ll]
-    - [lunar,       ppc64el,  ga-23.04,        generic,     linux-generic,                        *sa_hwe_ll]
-    - [lunar,       s390x,    ga-23.04,        generic,     linux-generic,                        *sa_hwe_ll]
+    - [lunar,       amd64,    ga-23.04,        generic,     linux-generic,                        *sa_hwe_ll, generic, *sp_generic]
+    - [lunar,       amd64,    ga-23.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_ll, generic, *sp_generic]
+    - [lunar,       arm64,    ga-23.04,        generic,     linux-generic,                        *sa_hwe_ll, generic, *sp_generic]
+    - [lunar,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae], *glpae, *sp_lpae]
+    - [lunar,       armhf,    ga-23.04,        generic,     linux-generic,                        *arm_hwe_ll, generic, *sp_generic_arm]
+    - [lunar,       ppc64el,  ga-23.04,        generic,     linux-generic,                        *sa_hwe_ll, generic, *sp_generic]
+    - [lunar,       s390x,    ga-23.04,        generic,     linux-generic,                        *sa_hwe_ll, generic, *sp_generic]
  - version: "22.10"
    release: kinetic
    kernels:
-    - [kinetic,       amd64,    ga-22.10,        generic,     linux-generic,                        *sa_hwe_kk]
-    - [kinetic,       amd64,    ga-22.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_kk]
-    - [kinetic,       arm64,    ga-22.10,        generic,     linux-generic,                        *sa_hwe_kk]
-    - [kinetic,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [kinetic,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [kinetic,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [kinetic,       armhf,    ga-22.10,        generic,     linux-generic,                        *arm_hwe_kk]
-    - [kinetic,       ppc64el,  ga-22.10,        generic,     linux-generic,                        *sa_hwe_kk]
-    - [kinetic,       s390x,    ga-22.10,        generic,     linux-generic,                        *sa_hwe_kk]
+    - [kinetic,       amd64,    ga-22.10,        generic,     linux-generic,                        *sa_hwe_kk, generic, *sp_generic]
+    - [kinetic,       amd64,    ga-22.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_kk, generic, *sp_generic]
+    - [kinetic,       arm64,    ga-22.10,        generic,     linux-generic,                        *sa_hwe_kk, generic, *sp_generic]
+    - [kinetic,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *mustang, *sp_mustang, *kh-mustang]
+    - [kinetic,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *xguboot, *sp_xgene, *kh-xgene]
+    - [kinetic,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae], *glpae, *sp_lpae]
+    - [kinetic,       armhf,    ga-22.10,        generic,     linux-generic,                        *arm_hwe_kk, generic, *sp_generic_arm]
+    - [kinetic,       ppc64el,  ga-22.10,        generic,     linux-generic,                        *sa_hwe_kk, generic, *sp_generic]
+    - [kinetic,       s390x,    ga-22.10,        generic,     linux-generic,                        *sa_hwe_kk, generic, *sp_generic]
  - version: "22.04"
    release: jammy
    kernels:
-    - [jammy,       amd64,    ga-22.04,        generic,     linux-generic,                        *sa_hwe_jj]
-    - [jammy,       amd64,    ga-22.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_jj]
-    - [jammy,       amd64,    hwe-22.04,       generic,     linux-generic-hwe-22.04,              *sa_hwe_jj]
-    - [jammy,       amd64,    hwe-22.04,       lowlatency,  linux-lowlatency-hwe-22.04,           *sa_hwe_jj]
-    - [jammy,       amd64,    hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *sa_hwe_jj_edge]
-    - [jammy,       amd64,    hwe-22.04-edge,  lowlatency,  linux-lowlatency-hwe-22.04-edge,      *sa_hwe_jj_edge]
-    - [jammy,       arm64,    ga-22.04,        generic,     linux-generic,                        *sa_hwe_jj]
-    - [jammy,       arm64,    hwe-22.04,       generic,     linux-generic-hwe-22.04,              *sa_hwe_jj]
-    - [jammy,       arm64,    hwe-22.04,       lowlatency,  linux-lowlatency-hwe-22.04,           *sa_hwe_jj]
-    - [jammy,       arm64,    hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *sa_hwe_jj_edge]
-    - [jammy,       arm64,    hwe-22.04-edge,  lowlatency,  linux-lowlatency-hwe-22.04-edge,      *sa_hwe_jj_edge]
-    - [jammy,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [jammy,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [jammy,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [jammy,       armhf,    ga-22.04,        generic,     linux-generic,                        *arm_hwe_jj]
-    - [jammy,       armhf,    hwe-22.04,       generic,     linux-generic-hwe-22.04,              *arm_hwe_jj]
-    - [jammy,       armhf,    hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *arm_hwe_jj_edge]
-    - [jammy,       ppc64el,  ga-22.04,        generic,     linux-generic,                        *sa_hwe_jj]
-    - [jammy,       ppc64el,  hwe-22.04,       generic,     linux-generic-hwe-22.04,              *sa_hwe_jj]
-    - [jammy,       ppc64el,  hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *sa_hwe_jj_edge]
-    - [jammy,       s390x,    ga-22.04,        generic,     linux-generic,                        *sa_hwe_jj]
-    - [jammy,       s390x,    hwe-22.04,       generic,     linux-generic-hwe-22.04,              *sa_hwe_jj]
-    - [jammy,       s390x,    hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *sa_hwe_jj_edge]
+    - [jammy,       amd64,    ga-22.04,        generic,     linux-generic,                        *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       amd64,    ga-22.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       amd64,    hwe-22.04,       generic,     linux-generic-hwe-22.04,              *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       amd64,    hwe-22.04,       lowlatency,  linux-lowlatency-hwe-22.04,           *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       amd64,    hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *sa_hwe_jj_edge, generic, *sp_generic]
+    - [jammy,       amd64,    hwe-22.04-edge,  lowlatency,  linux-lowlatency-hwe-22.04-edge,      *sa_hwe_jj_edge, generic, *sp_generic]
+    - [jammy,       arm64,    ga-22.04,        generic,     linux-generic,                        *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       arm64,    hwe-22.04,       generic,     linux-generic-hwe-22.04,              *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       arm64,    hwe-22.04,       lowlatency,  linux-lowlatency-hwe-22.04,           *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       arm64,    hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *sa_hwe_jj_edge, generic, *sp_generic]
+    - [jammy,       arm64,    hwe-22.04-edge,  lowlatency,  linux-lowlatency-hwe-22.04-edge,      *sa_hwe_jj_edge, generic, *sp_generic]
+    - [jammy,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *mustang, *sp_mustang, *kh-mustang]
+    - [jammy,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *xguboot, *sp_xgene, *kh-xgene]
+    - [jammy,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae], *glpae, *sp_lpae]
+    - [jammy,       armhf,    ga-22.04,        generic,     linux-generic,                        *arm_hwe_jj, generic, *sp_generic_arm]
+    - [jammy,       armhf,    hwe-22.04,       generic,     linux-generic-hwe-22.04,              *arm_hwe_jj, generic, *sp_generic_arm]
+    - [jammy,       armhf,    hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *arm_hwe_jj_edge, generic, *sp_generic_arm]
+    - [jammy,       ppc64el,  ga-22.04,        generic,     linux-generic,                        *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       ppc64el,  hwe-22.04,       generic,     linux-generic-hwe-22.04,              *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       ppc64el,  hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *sa_hwe_jj_edge, generic, *sp_generic]
+    - [jammy,       s390x,    ga-22.04,        generic,     linux-generic,                        *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       s390x,    hwe-22.04,       generic,     linux-generic-hwe-22.04,              *sa_hwe_jj, generic, *sp_generic]
+    - [jammy,       s390x,    hwe-22.04-edge,  generic,     linux-generic-hwe-22.04-edge,         *sa_hwe_jj_edge, generic, *sp_generic]
  - version: "21.10"
    release: impish
    kernels:
-    - [impish,       amd64,    ga-21.10,        generic,     linux-generic,                        *sa_hwe_ii]
-    - [impish,       amd64,    ga-21.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_ii]
-    - [impish,       arm64,    ga-21.10,        generic,     linux-generic,                        *sa_hwe_ii]
-    - [impish,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [impish,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [impish,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [impish,       armhf,    ga-21.10,        generic,     linux-generic,                        *arm_hwe_ii]
-    - [impish,       ppc64el,  ga-21.10,        generic,     linux-generic,                        *sa_hwe_ii]
-    - [impish,       s390x,    ga-21.10,        generic,     linux-generic,                        *sa_hwe_ii]
+    - [impish,       amd64,    ga-21.10,        generic,     linux-generic,                        *sa_hwe_ii, generic, *sp_generic]
+    - [impish,       amd64,    ga-21.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_ii, generic, *sp_generic]
+    - [impish,       arm64,    ga-21.10,        generic,     linux-generic,                        *sa_hwe_ii, generic, *sp_generic]
+    - [impish,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *mustang, *sp_mustang, *kh-mustang]
+    - [impish,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *xguboot, *sp_xgene, *kh-xgene]
+    - [impish,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae], *glpae, *sp_lpae]
+    - [impish,       armhf,    ga-21.10,        generic,     linux-generic,                        *arm_hwe_ii, generic, *sp_generic_arm]
+    - [impish,       ppc64el,  ga-21.10,        generic,     linux-generic,                        *sa_hwe_ii, generic, *sp_generic]
+    - [impish,       s390x,    ga-21.10,        generic,     linux-generic,                        *sa_hwe_ii, generic, *sp_generic]
  - version: "21.04"
    release: hirsute
    kernels:
-    - [hirsute,       amd64,    ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh]
-    - [hirsute,       amd64,    ga-21.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_hh]
-    - [hirsute,       arm64,    ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh]
-    - [hirsute,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [hirsute,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [hirsute,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [hirsute,       armhf,    ga-21.04,        generic,     linux-generic,                        *arm_hwe_hh]
-    - [hirsute,       i386,     ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh]
-    - [hirsute,       i386,     ga-21.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_hh]
-    - [hirsute,       ppc64el,  ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh]
-    - [hirsute,       s390x,    ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh]
+    - [hirsute,       amd64,    ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh, generic, *sp_generic]
+    - [hirsute,       amd64,    ga-21.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_hh, generic, *sp_generic]
+    - [hirsute,       arm64,    ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh, generic, *sp_generic]
+    - [hirsute,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *mustang, *sp_mustang, *kh-mustang]
+    - [hirsute,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *xguboot, *sp_xgene, *kh-xgene]
+    - [hirsute,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae], *glpae, *sp_lpae]
+    - [hirsute,       armhf,    ga-21.04,        generic,     linux-generic,                        *arm_hwe_hh, generic, *sp_generic_arm]
+    - [hirsute,       i386,     ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh, generic, *sp_generic]
+    - [hirsute,       i386,     ga-21.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_hh, generic, *sp_generic]
+    - [hirsute,       ppc64el,  ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh, generic, *sp_generic]
+    - [hirsute,       s390x,    ga-21.04,        generic,     linux-generic,                        *sa_hwe_hh, generic, *sp_generic]
  - version: "20.10"
    release: groovy
    kernels:
-    - [groovy,       amd64,    ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg]
-    - [groovy,       amd64,    ga-20.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_gg]
-    - [groovy,       arm64,    ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg]
-    - [groovy,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [groovy,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [groovy,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [groovy,       armhf,    ga-20.10,        generic,     linux-generic,                        *arm_hwe_gg]
-    - [groovy,       i386,     ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg]
-    - [groovy,       i386,     ga-20.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_gg]
-    - [groovy,       ppc64el,  ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg]
-    - [groovy,       s390x,    ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg]
+    - [groovy,       amd64,    ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg, generic, *sp_generic]
+    - [groovy,       amd64,    ga-20.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_gg, generic, *sp_generic]
+    - [groovy,       arm64,    ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg, generic, *sp_generic]
+    - [groovy,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *mustang, *sp_mustang, *kh-mustang]
+    - [groovy,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *xguboot, *sp_xgene, *kh-xgene]
+    - [groovy,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae], *glpae, *sp_lpae]
+    - [groovy,       armhf,    ga-20.10,        generic,     linux-generic,                        *arm_hwe_gg, generic, *sp_generic_arm]
+    - [groovy,       i386,     ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg, generic, *sp_generic]
+    - [groovy,       i386,     ga-20.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_gg, generic, *sp_generic]
+    - [groovy,       ppc64el,  ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg, generic, *sp_generic]
+    - [groovy,       s390x,    ga-20.10,        generic,     linux-generic,                        *sa_hwe_gg, generic, *sp_generic]
  - version: "20.04"
    release: focal
    kernels:
-    - [focal,       amd64,    ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff]
-    - [focal,       amd64,    ga-20.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_ff]
-    - [focal,       amd64,    hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff]
-    - [focal,       amd64,    hwe-20.04,       lowlatency,  linux-lowlatency-hwe-20.04,           *sa_hwe_ff]
-    - [focal,       amd64,    hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge]
-    - [focal,       amd64,    hwe-20.04-edge,  lowlatency,  linux-lowlatency-hwe-20.04-edge,      *sa_hwe_ff_edge]
-    - [focal,       arm64,    ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff]
-    - [focal,       arm64,    hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff]
-    - [focal,       arm64,    hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge]
-    - [focal,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [focal,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [focal,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [focal,       armhf,    ga-20.04,        generic,     linux-generic,                        *arm_hwe_ff]
-    - [focal,       armhf,    hwe-20.04,       generic,     linux-generic-hwe-20.04,              *arm_hwe_ff]
-    - [focal,       armhf,    hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *arm_hwe_ff_edge]
-    - [focal,       i386,     ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff]
-    - [focal,       i386,     ga-20.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_ff]
-    - [focal,       i386,     hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff]
-    - [focal,       i386,     hwe-20.04,       lowlatency,  linux-lowlatency-hwe-20.04,           *sa_hwe_ff]
-    - [focal,       i386,     hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge]
-    - [focal,       i386,     hwe-20.04-edge,  lowlatency,  linux-lowlatency-hwe-20.04-edge,      *sa_hwe_ff_edge]
-    - [focal,       ppc64el,  ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff]
-    - [focal,       ppc64el,  hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff]
-    - [focal,       ppc64el,  hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge]
-    - [focal,       s390x,    ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff]
-    - [focal,       s390x,    hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff]
-    - [focal,       s390x,    hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge]
+    - [focal,       amd64,    ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       amd64,    ga-20.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       amd64,    hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       amd64,    hwe-20.04,       lowlatency,  linux-lowlatency-hwe-20.04,           *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       amd64,    hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge, generic, *sp_generic]
+    - [focal,       amd64,    hwe-20.04-edge,  lowlatency,  linux-lowlatency-hwe-20.04-edge,      *sa_hwe_ff_edge, generic, *sp_generic]
+    - [focal,       arm64,    ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       arm64,    hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       arm64,    hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge, generic, *sp_generic]
+    - [focal,       arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *mustang, *sp_mustang, *kh-mustang]
+    - [focal,       arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *xguboot, *sp_xgene, *kh-xgene]
+    - [focal,       armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae], *glpae, *sp_lpae]
+    - [focal,       armhf,    ga-20.04,        generic,     linux-generic,                        *arm_hwe_ff, generic, *sp_generic_arm]
+    - [focal,       armhf,    hwe-20.04,       generic,     linux-generic-hwe-20.04,              *arm_hwe_ff, generic, *sp_generic_arm]
+    - [focal,       armhf,    hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *arm_hwe_ff_edge, generic, *sp_generic_arm]
+    - [focal,       i386,     ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       i386,     ga-20.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       i386,     hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       i386,     hwe-20.04,       lowlatency,  linux-lowlatency-hwe-20.04,           *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       i386,     hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge, generic, *sp_generic]
+    - [focal,       i386,     hwe-20.04-edge,  lowlatency,  linux-lowlatency-hwe-20.04-edge,      *sa_hwe_ff_edge, generic, *sp_generic]
+    - [focal,       ppc64el,  ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       ppc64el,  hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       ppc64el,  hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge, generic, *sp_generic]
+    - [focal,       s390x,    ga-20.04,        generic,     linux-generic,                        *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       s390x,    hwe-20.04,       generic,     linux-generic-hwe-20.04,              *sa_hwe_ff, generic, *sp_generic]
+    - [focal,       s390x,    hwe-20.04-edge,  generic,     linux-generic-hwe-20.04-edge,         *sa_hwe_ff_edge, generic, *sp_generic]
  - version: "18.04"
    release: bionic
    kernels:
-    - [bionic,     amd64,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
-    - [bionic,     amd64,    ga-18.04,        lowlatency,  linux-lowlatency,                     *sa_hwe_b]
-    - [bionic,     amd64,    hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b]
-    - [bionic,     amd64,    hwe-18.04,       lowlatency,  linux-lowlatency-hwe-18.04,           *sa_hwe_b]
-    - [bionic,     amd64,    hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge]
-    - [bionic,     amd64,    hwe-18.04-edge,  lowlatency,  linux-lowlatency-hwe-18.04-edge,      *sa_hwe_b_edge]
-    - [bionic,     arm64,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
-    - [bionic,     arm64,    hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b]
-    - [bionic,     arm64,    hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge]
-    - [bionic,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [bionic,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [bionic,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [bionic,     armhf,    ga-18.04,        generic,     linux-generic,                        *arm_hwe_b]
-    - [bionic,     armhf,    hwe-18.04,       generic,     linux-generic-hwe-18.04,              *arm_hwe_b]
-    - [bionic,     armhf,    hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *arm_hwe_b_edge]
-    - [bionic,     i386,     ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
-    - [bionic,     i386,     ga-18.04,        lowlatency,  linux-lowlatency,                     *sa_hwe_b]
-    - [bionic,     i386,     hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b]
-    - [bionic,     i386,     hwe-18.04,       lowlatency,  linux-lowlatency-hwe-18.04,           *sa_hwe_b]
-    - [bionic,     i386,     hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge]
-    - [bionic,     i386,     hwe-18.04-edge,  lowlatency,  linux-lowlatency-hwe-18.04-edge,      *sa_hwe_b_edge]
-    - [bionic,     ppc64el,  ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
-    - [bionic,     ppc64el,  hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b]
-    - [bionic,     ppc64el,  hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge]
-    - [bionic,     s390x,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
-    - [bionic,     s390x,    hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b]
-    - [bionic,     s390x,    hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge]
+    - [bionic,     amd64,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     amd64,    ga-18.04,        lowlatency,  linux-lowlatency,                     *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     amd64,    hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     amd64,    hwe-18.04,       lowlatency,  linux-lowlatency-hwe-18.04,           *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     amd64,    hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge, generic, *sp_generic]
+    - [bionic,     amd64,    hwe-18.04-edge,  lowlatency,  linux-lowlatency-hwe-18.04-edge,      *sa_hwe_b_edge, generic, *sp_generic]
+    - [bionic,     arm64,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     arm64,    hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     arm64,    hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge, generic, *sp_generic]
+    - [bionic,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *mustang, *sp_mustang, *kh-mustang]
+    - [bionic,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *xguboot, *sp_xgene, *kh-xgene]
+    - [bionic,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae], *glpae, *sp_lpae]
+    - [bionic,     armhf,    ga-18.04,        generic,     linux-generic,                        *arm_hwe_b, generic, *sp_generic_arm]
+    - [bionic,     armhf,    hwe-18.04,       generic,     linux-generic-hwe-18.04,              *arm_hwe_b, generic, *sp_generic_arm]
+    - [bionic,     armhf,    hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *arm_hwe_b_edge, generic, *sp_generic_arm]
+    - [bionic,     i386,     ga-18.04,        generic,     linux-generic,                        *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     i386,     ga-18.04,        lowlatency,  linux-lowlatency,                     *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     i386,     hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     i386,     hwe-18.04,       lowlatency,  linux-lowlatency-hwe-18.04,           *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     i386,     hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge, generic, *sp_generic]
+    - [bionic,     i386,     hwe-18.04-edge,  lowlatency,  linux-lowlatency-hwe-18.04-edge,      *sa_hwe_b_edge, generic, *sp_generic]
+    - [bionic,     ppc64el,  ga-18.04,        generic,     linux-generic,                        *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     ppc64el,  hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     ppc64el,  hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge, generic, *sp_generic]
+    - [bionic,     s390x,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     s390x,    hwe-18.04,       generic,     linux-generic-hwe-18.04,              *sa_hwe_b, generic, *sp_generic]
+    - [bionic,     s390x,    hwe-18.04-edge,  generic,     linux-generic-hwe-18.04-edge,         *sa_hwe_b_edge, generic, *sp_generic]
  - version: "16.04"
    release: xenial
    kernels:
-    - [xenial,     amd64,    ga-16.04,        generic,     linux-generic,                        *sa_hwe_x]
-    - [xenial,     amd64,    ga-16.04,        lowlatency,  linux-lowlatency,                     *sa_hwe_x]
-    - [xenial,     amd64,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     amd64,    hwe-16.04,       lowlatency,  linux-lowlatency-hwe-16.04,           *sa_hwe_x]
-    - [xenial,     amd64,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
-    - [xenial,     amd64,    hwe-16.04-edge,  lowlatency,  linux-lowlatency-hwe-16.04-edge,      *sa_hwe_x_edge]
-    - [xenial,     arm64,    ga-16.04,        generic,     linux-generic,                        *sa_hwe_x]
-    - [xenial,     arm64,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     arm64,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
-    - [xenial,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [xenial,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [xenial,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [xenial,     armhf,    ga-16.04,        generic,     linux-generic,                        *arm_hwe_x]
-    - [xenial,     armhf,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *arm_hwe_x]
-    - [xenial,     armhf,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *arm_hwe_x_edge]
-    - [xenial,     i386,     ga-16.04,        generic,     linux-generic,                        *sa_hwe_x]
-    - [xenial,     i386,     ga-16.04,        lowlatency,  linux-lowlatency,                     *sa_hwe_x]
-    - [xenial,     i386,     hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     i386,     hwe-16.04,       lowlatency,  linux-lowlatency-hwe-16.04,           *sa_hwe_x]
-    - [xenial,     i386,     hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
-    - [xenial,     i386,     hwe-16.04-edge,  lowlatency,  linux-lowlatency-hwe-16.04-edge,      *sa_hwe_x_edge]
-    - [xenial,     ppc64el,  ga-16.04,        generic,     linux-generic,                        *sa_hwe_x]
-    - [xenial,     ppc64el,  hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     ppc64el,  hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
-    - [xenial,     s390x,    ga-16.04,        generic,     linux-generic,                        *sa_hwe_x]
-    - [xenial,     s390x,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     s390x,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
+    - [xenial,     amd64,    ga-16.04,        generic,     linux-generic,                        *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     amd64,    ga-16.04,        lowlatency,  linux-lowlatency,                     *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     amd64,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     amd64,    hwe-16.04,       lowlatency,  linux-lowlatency-hwe-16.04,           *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     amd64,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge, generic, *sp_generic]
+    - [xenial,     amd64,    hwe-16.04-edge,  lowlatency,  linux-lowlatency-hwe-16.04-edge,      *sa_hwe_x_edge, generic, *sp_generic]
+    - [xenial,     arm64,    ga-16.04,        generic,     linux-generic,                        *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     arm64,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     arm64,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge, generic, *sp_generic]
+    - [xenial,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *mustang, *sp_mustang, *kh-mustang]
+    - [xenial,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *xguboot, *sp_xgene, *kh-xgene]
+    - [xenial,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae], *glpae, *sp_lpae]
+    - [xenial,     armhf,    ga-16.04,        generic,     linux-generic,                        *arm_hwe_x, generic, *sp_generic_arm]
+    - [xenial,     armhf,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *arm_hwe_x, generic, *sp_generic_arm]
+    - [xenial,     armhf,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *arm_hwe_x_edge, generic, *sp_generic_arm]
+    - [xenial,     i386,     ga-16.04,        generic,     linux-generic,                        *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     i386,     ga-16.04,        lowlatency,  linux-lowlatency,                     *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     i386,     hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     i386,     hwe-16.04,       lowlatency,  linux-lowlatency-hwe-16.04,           *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     i386,     hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge, generic, *sp_generic]
+    - [xenial,     i386,     hwe-16.04-edge,  lowlatency,  linux-lowlatency-hwe-16.04-edge,      *sa_hwe_x_edge, generic, *sp_generic]
+    - [xenial,     ppc64el,  ga-16.04,        generic,     linux-generic,                        *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     ppc64el,  hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     ppc64el,  hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge, generic, *sp_generic]
+    - [xenial,     s390x,    ga-16.04,        generic,     linux-generic,                        *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     s390x,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x, generic, *sp_generic]
+    - [xenial,     s390x,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge, generic, *sp_generic]
  - version: "14.04"
    builtin_kernel: linux-generic
    release: trusty
    kernels:
-    - [trusty,  armhf,   hwe-t,     generic,    linux-generic,                     *arm_hwe_t]
-    - [trusty,  armhf,   *glpae,    *glpae,     linux-generic-lpae,                [*glpae]]
-    - [trusty,  i386,    hwe-t,     generic,    linux-generic,                     *sa_hwe_t]
-    - [trusty,  amd64,   hwe-t,     generic,    linux-generic,              *sa_hwe_t]
-    - [trusty,  ppc64el, hwe-t,     generic,    linux-generic,                     *sa_hwe_t]
-    - [trusty,  arm64,   hwe-t,     generic,    linux-generic,                     *sa_hwe_t]
-    - [trusty,  arm64,   *xguboot,  generic,    linux-generic,                     [*xguboot], *kh-xgene]
-    - [trusty,  arm64,   *mustang,  generic,    linux-generic,                     [*mustang], *kh-mustang]
-    - [utopic,  amd64,   hwe-u,     generic,    linux-generic-lts-utopic,   *sa_hwe_u]
-    - [utopic,  arm64,   hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u]
-    - [utopic,  armhf,   hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u]
-    - [utopic,  i386,    hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u]
-    - [utopic,  ppc64el, hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u]
-    - [vivid,   amd64,   hwe-v,     generic,    linux-generic-lts-vivid,    *sa_hwe_v]
-    - [vivid,   arm64,   hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v]
-    - [vivid,   armhf,   hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v]
-    - [vivid,   i386,    hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v]
-    - [vivid,   ppc64el, hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v]
-    - [wily,    amd64,   hwe-w,     generic,    linux-generic-lts-wily,     *sa_hwe_w]
-    - [wily,    arm64,   hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w]
-    - [wily,    armhf,   hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w]
-    - [wily,    i386,    hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w]
-    - [wily,    ppc64el, hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w]
-    - [xenial,  amd64,   hwe-x,     generic,    linux-generic-lts-xenial,   *sa_hwe_x_legacy]
-    - [xenial,  amd64,   hwe-x,     lowlatency, linux-lowlatency-lts-xenial, *sa_hwe_x_legacy]
-    - [xenial,  arm64,   hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy]
-    - [xenial,  armhf,   hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy]
-    - [xenial,  i386,    hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy]
-    - [xenial,  i386,    hwe-x,     lowlatency, linux-lowlatency,                  *sa_hwe_x_legacy]
-    - [xenial,  ppc64el, hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy]
+    - [trusty,  armhf,   hwe-t,     generic,    linux-generic,                     *arm_hwe_t, generic, *sp_generic_arm]
+    - [trusty,  armhf,   *glpae,    *glpae,     linux-generic-lpae,                [*glpae], *glpae, *sp_lpae]
+    - [trusty,  i386,    hwe-t,     generic,    linux-generic,                     *sa_hwe_t, generic, *sp_generic]
+    - [trusty,  amd64,   hwe-t,     generic,    linux-generic,              *sa_hwe_t, generic, *sp_generic]
+    - [trusty,  ppc64el, hwe-t,     generic,    linux-generic,                     *sa_hwe_t, generic, *sp_generic]
+    - [trusty,  arm64,   hwe-t,     generic,    linux-generic,                     *sa_hwe_t, generic, *sp_generic]
+    - [trusty,  arm64,   *xguboot,  generic,    linux-generic,                     [*xguboot], *xguboot, *sp_xgene, *kh-xgene]
+    - [trusty,  arm64,   *mustang,  generic,    linux-generic,                     [*mustang], *mustang, *sp_mustang, *kh-mustang]
+    - [utopic,  amd64,   hwe-u,     generic,    linux-generic-lts-utopic,   *sa_hwe_u, generic, *sp_generic]
+    - [utopic,  arm64,   hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u, generic, *sp_generic]
+    - [utopic,  armhf,   hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u, generic, *sp_generic]
+    - [utopic,  i386,    hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u, generic, *sp_generic]
+    - [utopic,  ppc64el, hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u, generic, *sp_generic]
+    - [vivid,   amd64,   hwe-v,     generic,    linux-generic-lts-vivid,    *sa_hwe_v, generic, *sp_generic]
+    - [vivid,   arm64,   hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v, generic, *sp_generic]
+    - [vivid,   armhf,   hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v, generic, *sp_generic]
+    - [vivid,   i386,    hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v, generic, *sp_generic]
+    - [vivid,   ppc64el, hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v, generic, *sp_generic]
+    - [wily,    amd64,   hwe-w,     generic,    linux-generic-lts-wily,     *sa_hwe_w, generic, *sp_generic]
+    - [wily,    arm64,   hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w, generic, *sp_generic]
+    - [wily,    armhf,   hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w, generic, *sp_generic]
+    - [wily,    i386,    hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w, generic, *sp_generic]
+    - [wily,    ppc64el, hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w, generic, *sp_generic]
+    - [xenial,  amd64,   hwe-x,     generic,    linux-generic-lts-xenial,   *sa_hwe_x_legacy, generic, *sp_generic]
+    - [xenial,  amd64,   hwe-x,     lowlatency, linux-lowlatency-lts-xenial, *sa_hwe_x_legacy, generic, *sp_generic]
+    - [xenial,  arm64,   hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy, generic, *sp_generic]
+    - [xenial,  armhf,   hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy, generic, *sp_generic]
+    - [xenial,  i386,    hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy, generic, *sp_generic]
+    - [xenial,  i386,    hwe-x,     lowlatency, linux-lowlatency,                  *sa_hwe_x_legacy, generic, *sp_generic]
+    - [xenial,  ppc64el, hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy, generic, *sp_generic]
  - version: "12.04"
    release: precise
    builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'}
    kernels:
-    - [precise, i386,    hwe-p,    generic,  linux-generic,             *sa_hwe_p]
-    - [precise, amd64,   hwe-p,    generic,  linux-generic,             *sa_hwe_p]
-    - [precise, armhf,   highbank, highbank, linux-highbank,            [highbank]]
-    - [quantal, i386,    hwe-q,    generic,  linux-generic-lts-quantal, *sa_hwe_q]
-    - [quantal, amd64,   hwe-q,    generic,  linux-signed-generic-lts-quantal, *sa_hwe_q]
-    - [raring,  i386,    hwe-r,    generic,  linux-generic-lts-raring,  *sa_hwe_r]
-    - [raring,  amd64,   hwe-r,    generic,  linux-signed-generic-lts-raring,  *sa_hwe_r]
-    - [saucy,   i386,    hwe-s,    generic,  linux-generic-lts-saucy,   *sa_hwe_s]
-    - [saucy,   amd64,   hwe-s,    generic,  linux-signed-generic-lts-saucy,   *sa_hwe_s]
-    - [trusty,  i386,    hwe-t,    generic,  linux-generic-lts-trusty,  *sa_hwe_t]
-    - [trusty,  amd64,   hwe-t,    generic,  linux-signed-generic-lts-trusty,  *sa_hwe_t]
+    - [precise, i386,    hwe-p,    generic,  linux-generic,             *sa_hwe_p, generic, *sp_generic]
+    - [precise, amd64,   hwe-p,    generic,  linux-generic,             *sa_hwe_p, generic, *sp_generic]
+    - [precise, armhf,   highbank, highbank, linux-highbank,            [highbank], highbank, *sp_highbank]
+    - [quantal, i386,    hwe-q,    generic,  linux-generic-lts-quantal, *sa_hwe_q, generic, *sp_generic]
+    - [quantal, amd64,   hwe-q,    generic,  linux-signed-generic-lts-quantal, *sa_hwe_q, generic, *sp_generic]
+    - [raring,  i386,    hwe-r,    generic,  linux-generic-lts-raring,  *sa_hwe_r, generic, *sp_generic]
+    - [raring,  amd64,   hwe-r,    generic,  linux-signed-generic-lts-raring,  *sa_hwe_r, generic, *sp_generic]
+    - [saucy,   i386,    hwe-s,    generic,  linux-generic-lts-saucy,   *sa_hwe_s, generic, *sp_generic]
+    - [saucy,   amd64,   hwe-s,    generic,  linux-signed-generic-lts-saucy,   *sa_hwe_s, generic, *sp_generic]
+    - [trusty,  i386,    hwe-t,    generic,  linux-generic-lts-trusty,  *sa_hwe_t, generic, *sp_generic]
+    - [trusty,  amd64,   hwe-t,    generic,  linux-signed-generic-lts-trusty,  *sa_hwe_t, generic, *sp_generic]
 
 # enable_proposed: True
 
diff --git a/meph2/stream.py b/meph2/stream.py
index 2d3cb7b..9ceb50e 100644
--- a/meph2/stream.py
+++ b/meph2/stream.py
@@ -39,13 +39,13 @@ def read_kdata(info, ret=list):
     # copy it for our modification.
     info = list(info)
 
-    # 7th field is optional in kernel lines in config data
+    # 9th field is optional in kernel lines in config data
     # so fill it with empty dictionary if not present.
-    if len(info) == 6:
+    if len(info) == 8:
         info.append({})
 
     names = ("krel", "arch", "subarch", "flavor", "kpkg",
-             "subarches", "kdata")
+             "subarches", "platform", "supported_platforms", "kdata")
     if ret == list:
         return info
     elif ret == dict:
@@ -197,8 +197,10 @@ def create_version(arch, release, version_name, img_url, out_d,
     kdata_defaults = {'suffix': "", 'di-format': "default", 'dtb': ""}
 
     for info in rdata['kernels']:
-        (krel, karch, psubarch, flavor, kpkg, subarches, kdata) = (
-            read_kdata(info))
+        (krel, karch, psubarch, flavor, kpkg, subarches,
+         platform, supported_platforms, kdata) = (
+            read_kdata(info)
+        )
 
         if karch != arch:
             continue
@@ -258,10 +260,13 @@ def create_version(arch, release, version_name, img_url, out_d,
         if prodname in newitems:
             raise ValueError("duplicate prodname %s from %s" %
                              (prodname, subs))
-
-        common = {'subarches': ','.join(subarches), 'krel': krel,
-                  'release': release, 'version': version, 'arch': arch,
-                  'subarch': psubarch, 'kflavor': flavor}
+        common = {
+            'subarches': ','.join(subarches), 'krel': krel,
+            'release': release, 'version': version, 'arch': arch,
+            'subarch': psubarch, 'kflavor': flavor,
+            'platform': platform,
+            'supported_platforms': ','.join(supported_platforms)
+        }
         common.update(ALL_ITEM_TAGS)
 
         if release in REL2VER:
-- 
Mailing list: https://launchpad.net/~sts-sponsors
Post to     : sts-sponsors@lists.launchpad.net
Unsubscribe : https://launchpad.net/~sts-sponsors
More help   : https://help.launchpad.net/ListHelp

Reply via email to