2 files changed, 21 insertions, 19 deletions
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
deleted file mode 100644
index 882c4e2b1f..0000000000
--- a/debian/config/s390x/defines
+++ /dev/null
@@ -1,19 +0,0 @@
-[base]
-flavours:
- s390x
-default-flavour: s390x
-kernel-arch: s390
-
-[build]
-image-file: arch/s390/boot/bzImage
-vdso: true
-
-[image]
-suggests: s390-tools
-install-stem: vmlinuz
-
-[s390x_description]
-hardware: IBM zSeries
-
-[s390x_packages]
-installer: true
diff --git a/debian/config/s390x/defines.toml b/debian/config/s390x/defines.toml
new file mode 100644
index 0000000000..ca4bd5c5e1
--- /dev/null
+++ b/debian/config/s390x/defines.toml
@@ -0,0 +1,21 @@
+[[flavour]]
+name = 's390x'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'IBM zSeries'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/s390/boot/bzImage'
+kernel_stem = 'vmlinuz'
+
+[relations.image]
+suggests = [
+  's390-tools',
+]