6 files changed, 125 insertions, 134 deletions
diff --git a/debian/config/mips64/defines b/debian/config/mips64/defines
deleted file mode 100644
index 7b4efe79c6..0000000000
--- a/debian/config/mips64/defines
+++ /dev/null
@@ -1,50 +0,0 @@
-[base]
-flavours:
- 5kc-malta
- mips64r2eb
- octeon
-kernel-arch: mips
-
-[build]
-image-file: vmlinuz
-
-[image]
-install-stem: vmlinuz
-
-[5kc-malta_description]
-hardware: MIPS Malta
-hardware-long: MIPS Malta boards
-
-[5kc-malta_image]
-configs:
- kernelarch-mips/config.malta
- kernelarch-mips/config.mips64r2
-
-[5kc-malta_packages]
-installer: true
-
-[mips64r2eb_description]
-hardware: MIPS Generic (mips64r2eb)
-hardware-long: MIPS Generic platform (mips64r2eb)
-
-[mips64r2eb_image]
-configs:
- kernelarch-mips/config.boston
- kernelarch-mips/config.mips64r2
-
-[mips64r2eb_packages]
-installer: true
-
-[octeon_description]
-hardware: Octeon
-hardware-long: Cavium Networks Octeon
-
-[octeon_build]
-image-file: vmlinux
-
-[octeon_image]
-install-stem: vmlinux
-configs: kernelarch-mips/config.octeon
-
-[octeon_packages]
-installer: true
diff --git a/debian/config/mips64/defines.toml b/debian/config/mips64/defines.toml
new file mode 100644
index 0000000000..686be0d2b7
--- /dev/null
+++ b/debian/config/mips64/defines.toml
@@ -0,0 +1,46 @@
+[[flavour]]
+name = '5kc-malta'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.malta',
+  'kernelarch-mips/config.mips64r2',
+]
+[flavour.description]
+hardware = 'MIPS Malta'
+hardware_long = 'MIPS Malta boards'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'mips64r2eb'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.boston',
+  'kernelarch-mips/config.mips64r2',
+]
+[flavour.description]
+hardware = 'MIPS Generic (mips64r2eb)'
+hardware_long = 'MIPS Generic platform (mips64r2eb)'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'octeon'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.octeon',
+]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+[flavour.description]
+hardware = 'Octeon'
+hardware_long = 'Cavium Networks Octeon'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinuz'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/mips64el/defines b/debian/config/mips64el/defines
deleted file mode 100644
index 08cbbae433..0000000000
--- a/debian/config/mips64el/defines
+++ /dev/null
@@ -1,62 +0,0 @@
-[base]
-flavours:
- 5kc-malta
- mips64r2el
- loongson-3
- octeon
-kernel-arch: mips
-
-[build]
-image-file: vmlinuz
-
-[image]
-install-stem: vmlinuz
-
-[5kc-malta_description]
-hardware: MIPS Malta
-hardware-long: MIPS Malta boards
-
-[5kc-malta_image]
-configs:
- kernelarch-mips/config.malta
- kernelarch-mips/config.mips64r2
-
-[5kc-malta_packages]
-installer: true
-
-[mips64r2el_description]
-hardware: MIPS Generic (mips64r2el)
-hardware-long: MIPS Generic platform (mips64r2el)
-
-[mips64r2el_image]
-configs:
- kernelarch-mips/config.boston
- kernelarch-mips/config.mips64r2
-
-[mips64r2el_packages]
-installer: true
-
-[loongson-3_description]
-hardware: Loongson 3A/3B
-hardware-long: Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)
-
-[loongson-3_image]
-recommends: pmon-update
-configs: kernelarch-mips/config.loongson-3
-
-[loongson-3_packages]
-installer: true
-
-[octeon_description]
-hardware: Octeon
-hardware-long: Cavium Networks Octeon
-
-[octeon_build]
-image-file: vmlinux
-
-[octeon_image]
-install-stem: vmlinux
-configs: kernelarch-mips/config.octeon
-
-[octeon_packages]
-installer: true
diff --git a/debian/config/mips64el/defines.toml b/debian/config/mips64el/defines.toml
new file mode 100644
index 0000000000..0be05d5d76
--- /dev/null
+++ b/debian/config/mips64el/defines.toml
@@ -0,0 +1,60 @@
+[[flavour]]
+name = '5kc-malta'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.malta',
+  'kernelarch-mips/config.mips64r2',
+]
+[flavour.description]
+hardware = 'MIPS Malta'
+hardware_long = 'MIPS Malta boards'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'mips64r2el'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.boston',
+  'kernelarch-mips/config.mips64r2',
+]
+[flavour.description]
+hardware = 'MIPS Generic (mips64r2el)'
+hardware_long = 'MIPS Generic platform (mips64r2el)'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'loongson-3'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.loongson-3',
+]
+[flavour.description]
+hardware = 'Loongson 3A/3B'
+hardware_long = 'Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)'
+[flavour.packages]
+installer = true
+[flavour.relations.image]
+recommends = ['pmon-update']
+
+[[flavour]]
+name = 'octeon'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.octeon',
+]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+[flavour.description]
+hardware = 'Octeon'
+hardware_long = 'Cavium Networks Octeon'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinuz'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/mips64r6el/defines b/debian/config/mips64r6el/defines
deleted file mode 100644
index 410cee457f..0000000000
--- a/debian/config/mips64r6el/defines
+++ /dev/null
@@ -1,22 +0,0 @@
-[base]
-flavours:
- mips64r6el
-kernel-arch: mips
-
-[build]
-image-file: vmlinuz
-
-[image]
-install-stem: vmlinuz
-
-[mips64r6el_description]
-hardware: MIPS Generic (mips64r6el)
-hardware-long: MIPS Generic platform (mips64r6el)
-
-[mips64r6el_image]
-configs:
- kernelarch-mips/config.boston
- kernelarch-mips/config.mips64r6
-
-[mips64r6el_packages]
-installer: true
diff --git a/debian/config/mips64r6el/defines.toml b/debian/config/mips64r6el/defines.toml
new file mode 100644
index 0000000000..40848b9805
--- /dev/null
+++ b/debian/config/mips64r6el/defines.toml
@@ -0,0 +1,19 @@
+[[flavour]]
+name = 'mips64r6el'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.boston',
+  'kernelarch-mips/config.mips64r6',
+]
+[flavour.description]
+hardware = 'MIPS Generic (mips64r6el)'
+hardware_long = 'MIPS Generic platform (mips64r6el)'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinuz'
+kernel_stem = 'vmlinuz'