Merging debian version 6.7.7-1.

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

3 files changed, 26 insertions, 24 deletions

diff --git a/debian/config/s390x/config b/debian/config/s390x/config
index 4d9ffb34ed..fe01c9f905 100644
--- a/debian/config/s390x/config
+++ b/debian/config/s390x/config
@@ -88,11 +88,6 @@ CONFIG_S390_PRNG=m
 # CONFIG_MEMSTICK is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-# CONFIG_ATALK is not set
-
-##
 ## file: drivers/net/ppp/Kconfig
 ##
 # CONFIG_PPP is not set
@@ -212,6 +207,11 @@ CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 
 ##
+## file: net/appletalk/Kconfig
+##
+# CONFIG_ATALK is not set
+
+##
 ## file: net/atm/Kconfig
 ##
 # CONFIG_ATM is not set
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
deleted file mode 100644
index 882c4e2b1f..0000000000
--- a/debian/config/s390x/defines
+++ /dev/null
@@ -1,19 +0,0 @@
-[base]
-flavours:
- s390x
-default-flavour: s390x
-kernel-arch: s390
-
-[build]
-image-file: arch/s390/boot/bzImage
-vdso: true
-
-[image]
-suggests: s390-tools
-install-stem: vmlinuz
-
-[s390x_description]
-hardware: IBM zSeries
-
-[s390x_packages]
-installer: true
diff --git a/debian/config/s390x/defines.toml b/debian/config/s390x/defines.toml
new file mode 100644
index 0000000000..ca4bd5c5e1
--- /dev/null
+++ b/debian/config/s390x/defines.toml
@@ -0,0 +1,21 @@
+[[flavour]]
+name = 's390x'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'IBM zSeries'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/s390/boot/bzImage'
+kernel_stem = 'vmlinuz'
+
+[relations.image]
+suggests = [
+  's390-tools',
+]