Merging debian version 6.7.7-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 29 insertions, 24 deletions

diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
deleted file mode 100644
index 762775239f..0000000000
--- a/debian/config/armhf/defines
+++ /dev/null
@@ -1,24 +0,0 @@
-[base]
-featuresets:
- none
- rt
-kernel-arch: arm
-
-[build]
-image-file: arch/arm/boot/zImage
-vdso: true
-
-[image]
-install-stem: vmlinuz
-
-[armmp_description]
-hardware: ARMv7 multiplatform compatible SoCs
-hardware-long: ARMv7 multiplatform kernel. See
-  https://wiki.debian.org/DebianKernel/ARMMP for details of supported
-  platforms
-
-[armmp-lpae_description]
-hardware: ARMv7 multiplatform compatible SoCs supporting LPAE
-hardware-long: ARMv7 multiplatform kernel supporting LPAE. See
-  https://wiki.debian.org/DebianKernel/ARMMP for details of supported
-  platforms.
diff --git a/debian/config/armhf/defines.toml b/debian/config/armhf/defines.toml
new file mode 100644
index 0000000000..51cd3911a0
--- /dev/null
+++ b/debian/config/armhf/defines.toml
@@ -0,0 +1,29 @@
+[[flavour]]
+name = "armmp"
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'ARMv7 multiplatform compatible SoCs'
+hardware_long = 'ARMv7 multiplatform kernel. See https://wiki.debian.org/DebianKernel/ARMMP for details of supported platforms'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = "armmp-lpae"
+[flavour.description]
+hardware = 'ARMv7 multiplatform compatible SoCs supporting LPAE'
+hardware_long = 'ARMv7 multiplatform kernel supporting LPAE. See https://wiki.debian.org/DebianKernel/ARMMP for details of supported platforms.'
+
+[[featureset]]
+name = 'none'
+
+[[featureset]]
+name = 'rt'
+# Override available flavours in rt featureset
+[[featureset.flavour]]
+name = 'armmp'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/arm/boot/zImage'
+kernel_stem = 'vmlinuz'