4 files changed, 44 insertions, 42 deletions
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
deleted file mode 100644
index ed130f0440..0000000000
--- a/debian/config/i386/defines
+++ /dev/null
@@ -1,28 +0,0 @@
-[base]
-featuresets:
- none
- rt
-kernel-arch: x86
-
-[build]
-image-file: arch/x86/boot/bzImage
-vdso: true
-
-[description]
-part-long-pae: This kernel requires PAE (Physical Address Extension).
- This feature is supported by the Intel Pentium Pro/II/III/4/4M/D, Xeon,
- Core and Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron,
- Turion or Phenom; Transmeta Efficeon; VIA C7; and some other processors.
-
-[image]
-suggests: grub-pc | grub-efi-ia32 | extlinux
-install-stem: vmlinuz
-
-[686_description]
-hardware: older PCs
-hardware-long: PCs with one or more processors not supporting PAE
-
-[686-pae_description]
-hardware: modern PCs
-hardware-long: PCs with one or more processors supporting PAE
-parts: pae
diff --git a/debian/config/i386/defines.toml b/debian/config/i386/defines.toml
new file mode 100644
index 0000000000..f934e009e4
--- /dev/null
+++ b/debian/config/i386/defines.toml
@@ -0,0 +1,44 @@
+[[flavour]]
+name = '686'
+[flavour.description]
+hardware = 'older PCs'
+hardware_long = 'PCs with one or more processors not supporting PAE'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = '686-pae'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'modern PCs'
+hardware_long = 'PCs with one or more processors supporting PAE'
+parts = ['pae']
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[[featureset]]
+name = 'rt'
+# Override available flavours in rt featureset
+[[featureset.flavour]]
+name = '686-pae'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/x86/boot/bzImage'
+kernel_stem = 'vmlinuz'
+
+[description.short]
+pae = ''
+
+[description.long]
+pae = '''This kernel requires PAE (Physical Address Extension).
+This feature is supported by the Intel Pentium Pro/II/III/4/4M/D, Xeon,
+Core and Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron,
+Turion or Phenom; Transmeta Efficeon; VIA C7; and some other processors.'''
+
+[relations.image]
+suggests = ['grub-pc | grub-efi-ia32 | extlinux']
diff --git a/debian/config/i386/none/defines b/debian/config/i386/none/defines
deleted file mode 100644
index b9add20341..0000000000
--- a/debian/config/i386/none/defines
+++ /dev/null
@@ -1,11 +0,0 @@
-[base]
-flavours:
- 686
- 686-pae
-default-flavour: 686-pae
-
-[686_packages]
-installer: true
-
-[686-pae_packages]
-installer: true
diff --git a/debian/config/i386/rt/defines b/debian/config/i386/rt/defines
deleted file mode 100644
index 358e12d559..0000000000
--- a/debian/config/i386/rt/defines
+++ /dev/null
@@ -1,3 +0,0 @@
-[base]
-flavours:
- 686-pae