Merging debian version 6.7.7-1.

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

2 files changed, 46 insertions, 50 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'