From f978622e511efdd400901f20ca6b2900f2aab373 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 6 Aug 2023 03:51:54 +0200 Subject: [PATCH] udeb: Make MPT modules optional in scsi-modules (fixes FTBFS on s390x) The Fusion MPT drivers require port I/O, which is not available on s390x, and since commit c3f903472ffa their Kconfig dependencies have been changed to reflect this. Make their inclusion in scsi-modules optional. --- debian/changelog | 4 ++++ debian/installer/modules/scsi-modules | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09bd78047d..6bc508711c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ linux (6.5.2-1~exp1) UNRELEASED; urgency=medium [ Diederik de Haas ] * net/xdp: Enable XDP_SOCKETS_DIAG as module (Closes: #1051455) + [ Ben Hutchings ] + * udeb: Make MPT modules optional in scsi-modules (fixes FTBFS on s390x) + (Closes: #1051249) + -- Christian Göttsche Sun, 03 Sep 2023 18:23:17 +0200 linux (6.5.1-1~exp1) experimental; urgency=medium diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules index dfc8664486..14920f2fc7 100644 --- a/debian/installer/modules/scsi-modules +++ b/debian/installer/modules/scsi-modules @@ -1,8 +1,8 @@ # Include SCSI controller drivers by default drivers/scsi/** -mptfc -mptsas -mptspi +mptfc ? +mptsas ? +mptspi ? # Include iSCSI boot support iscsi_ibft ?