Merging debian version 6.7.7-1.

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

3 files changed, 29 insertions, 23 deletions

diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 03cb7bec52..bfd139e541 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -676,7 +676,7 @@ CONFIG_SCSI_GENERIC_NCR5380=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_IZIP_EPP16=y
+CONFIG_SCSI_IMM=y
 CONFIG_SCSI_IZIP_SLOW_CTR=y
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
diff --git a/debian/config/alpha/defines b/debian/config/alpha/defines
deleted file mode 100644
index bbe9c6f4ae..0000000000
--- a/debian/config/alpha/defines
+++ /dev/null
@@ -1,22 +0,0 @@
-[base]
-flavours: alpha-generic alpha-smp
-default-flavour: alpha-smp
-kernel-arch: alpha
-
-[build]
-image-file: arch/alpha/boot/vmlinux.gz
-
-[image]
-suggests: aboot, fdutils
-install-stem: vmlinuz
-
-[alpha-generic_description]
-hardware: Alpha
-hardware-long: DEC Alpha systems with extended kernel start address (Wildfire, Titan, Marvel)
-
-[alpha-generic_packages]
-installer: true
-
-[alpha-smp_description]
-hardware: Alpha SMP
-hardware-long: DEC Alpha SMP systems with extended kernel start address (Wildfire, Titan, Marvel)
diff --git a/debian/config/alpha/defines.toml b/debian/config/alpha/defines.toml
new file mode 100644
index 0000000000..2096f19d77
--- /dev/null
+++ b/debian/config/alpha/defines.toml
@@ -0,0 +1,28 @@
+[[flavour]]
+name = 'alpha-generic'
+[flavour.description]
+hardware = 'Alpha'
+hardware_long = 'DEC Alpha systems with extended kernel start address (Wildfire, Titan, Marvel)'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'alpha-smp'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'Alpha SMP'
+hardware_long = 'DEC Alpha SMP systems with extended kernel start address (Wildfire, Titan, Marvel)'
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'arch/alpha/boot/vmlinux.gz'
+kernel_stem = 'vmlinuz'
+
+[relations.image]
+suggests = [
+  'aboot',
+  'fdutils',
+]