Merging debian version 6.7.7-1.

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

2 files changed, 34 insertions, 29 deletions

diff --git a/debian/config/sparc64/defines b/debian/config/sparc64/defines
deleted file mode 100644
index a663ddf147..0000000000
--- a/debian/config/sparc64/defines
+++ /dev/null
@@ -1,29 +0,0 @@
-[base]
-flavours:
- sparc64
- sparc64-smp
-default-flavour: sparc64-smp
-kernel-arch: sparc
-
-[build]
-image-file: vmlinux
-
-[image]
-configs:
-suggests: fdutils, grub-ieee1275
-install-stem: vmlinux
-
-[sparc64_description]
-hardware: uniprocessor 64-bit UltraSPARC
-
-[sparc64_image]
-configs: kernelarch-sparc/config-up
-
-[sparc64_packages]
-installer: true
-
-[sparc64-smp_description]
-hardware: multiprocessor 64-bit UltraSPARC
-
-[sparc64-smp_image]
-configs: kernelarch-sparc/config-smp
diff --git a/debian/config/sparc64/defines.toml b/debian/config/sparc64/defines.toml
new file mode 100644
index 0000000000..b3969e82a8
--- /dev/null
+++ b/debian/config/sparc64/defines.toml
@@ -0,0 +1,34 @@
+[[flavour]]
+name = 'sparc64'
+[flavour.build]
+config = [
+  'kernelarch-sparc/config-up',
+]
+[flavour.description]
+hardware = 'uniprocessor 64-bit UltraSPARC'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'sparc64-smp'
+[flavour.build]
+config = [
+  'kernelarch-sparc/config-smp',
+]
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'multiprocessor 64-bit UltraSPARC'
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+
+[relations.image]
+suggests = [
+  'fdutils',
+  'grub-ieee1275',
+]