Merging debian version 6.7.7-1.

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

2 files changed, 34 insertions, 23 deletions

diff --git a/debian/config/arm64/defines b/debian/config/arm64/defines
deleted file mode 100644
index e18344c807..0000000000
--- a/debian/config/arm64/defines
+++ /dev/null
@@ -1,23 +0,0 @@
-[base]
-compat-deb-arch: armhf
-compat-gnu-type: arm-linux-gnueabihf
-kernel-arch: arm64
-featuresets:
- none
- rt
-
-[build]
-image-file: arch/arm64/boot/Image
-vdso: true
-
-[image]
-install-stem: vmlinuz
-
-[arm64_description]
-hardware: 64-bit ARMv8 machines
-
-[cloud-arm64_description]
-hardware: arm64 cloud
-hardware-long: cloud platforms supporting arm64 virtual machines
-
-[arm64_image]
diff --git a/debian/config/arm64/defines.toml b/debian/config/arm64/defines.toml
new file mode 100644
index 0000000000..39111ff531
--- /dev/null
+++ b/debian/config/arm64/defines.toml
@@ -0,0 +1,34 @@
+[[flavour]]
+name = 'arm64'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = '64-bit ARMv8 machines'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'cloud-arm64'
+[flavour.build]
+config = ['config.cloud']
+[flavour.defs]
+is_quick = true
+[flavour.description]
+hardware = 'arm64 cloud'
+hardware_long = 'cloud platforms supporting arm64 virtual machines'
+
+[[featureset]]
+name = 'none'
+
+[[featureset]]
+name = 'rt'
+# Override available flavours in rt featureset
+[[featureset.flavour]]
+name = 'arm64'
+
+[build]
+compiler_gnutype_compat = 'arm-linux-gnueabihf'
+enable_signed = false
+enable_vdso = true
+kernel_file = 'arch/arm64/boot/Image'
+kernel_stem = 'vmlinuz'