From 4454b9685ff50001a84f6d78e8f30cb01765e940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Mon, 31 Oct 2022 07:34:46 +0000
Subject: [PATCH] linux: add custom d-i modules - debian stable

---
 .../d-i/modules/amd64-virtual/isofs-modules   |  1 +
 .../modules/amd64-virtual/scsi-core-modules   |  4 +++
 .../modules/amd64-virtual/usb-storage-modules |  1 +
 .../linux/d-i/modules/amd64/isofs-modules     |  1 +
 .../linux/d-i/modules/amd64/scsi-core-modules |  4 +++
 .../d-i/modules/amd64/usb-storage-modules     |  1 +
 .../linux/d-i/modules/arm64/isofs-modules     |  1 +
 .../linux/d-i/modules/arm64/scsi-core-modules |  1 +
 .../d-i/modules/arm64/usb-storage-modules     |  1 +
 .../linux/d-i/modules/armhf/isofs-modules     |  1 +
 .../linux/d-i/modules/armhf/scsi-core-modules |  1 +
 .../d-i/modules/armhf/usb-storage-modules     |  1 +
 .../d-i/modules/i386-virtual/isofs-modules    |  1 +
 .../modules/i386-virtual/scsi-core-modules    |  4 +++
 .../modules/i386-virtual/usb-storage-modules  |  1 +
 .../DATA/linux/d-i/modules/i386/isofs-modules |  1 +
 .../linux/d-i/modules/i386/scsi-core-modules  |  4 +++
 .../d-i/modules/i386/usb-storage-modules      |  1 +
 helpers/DATA/linux/d-i/modules/isofs-modules  |  1 +
 .../linux/d-i/modules/ppc64el/isofs-modules   |  1 +
 .../d-i/modules/ppc64el/scsi-core-modules     |  1 +
 .../d-i/modules/ppc64el/usb-storage-modules   |  1 +
 .../linux/d-i/modules/s390x/isofs-modules     |  1 +
 .../linux/d-i/modules/s390x/scsi-core-modules |  1 +
 .../DATA/linux/d-i/modules/scsi-core-modules  |  4 +++
 .../linux/d-i/modules/usb-storage-modules     |  2 ++
 helpers/DATA/linux/d-i/package-list           | 26 ++++++++++++++++---
 helpers/make-linux                            |  1 -
 28 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 helpers/DATA/linux/d-i/modules/amd64-virtual/isofs-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-core-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/amd64-virtual/usb-storage-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/amd64/isofs-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/amd64/scsi-core-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/amd64/usb-storage-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/arm64/isofs-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/arm64/scsi-core-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/arm64/usb-storage-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/armhf/isofs-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/armhf/scsi-core-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/armhf/usb-storage-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/i386-virtual/isofs-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/i386-virtual/scsi-core-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/i386-virtual/usb-storage-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/i386/isofs-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/i386/scsi-core-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/i386/usb-storage-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/isofs-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/ppc64el/isofs-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/ppc64el/scsi-core-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/ppc64el/usb-storage-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/s390x/isofs-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/s390x/scsi-core-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/scsi-core-modules
 create mode 100644 helpers/DATA/linux/d-i/modules/usb-storage-modules

diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/isofs-modules b/helpers/DATA/linux/d-i/modules/amd64-virtual/isofs-modules
new file mode 100644
index 00000000..da4fa9a3
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64-virtual/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-core-modules b/helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-core-modules
new file mode 100644
index 00000000..778a022f
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-core-modules
@@ -0,0 +1,4 @@
+#include <scsi-core-modules>
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/usb-storage-modules b/helpers/DATA/linux/d-i/modules/amd64-virtual/usb-storage-modules
new file mode 100644
index 00000000..8c5e81b5
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64-virtual/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/helpers/DATA/linux/d-i/modules/amd64/isofs-modules b/helpers/DATA/linux/d-i/modules/amd64/isofs-modules
new file mode 100644
index 00000000..da4fa9a3
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/helpers/DATA/linux/d-i/modules/amd64/scsi-core-modules b/helpers/DATA/linux/d-i/modules/amd64/scsi-core-modules
new file mode 100644
index 00000000..778a022f
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64/scsi-core-modules
@@ -0,0 +1,4 @@
+#include <scsi-core-modules>
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc
diff --git a/helpers/DATA/linux/d-i/modules/amd64/usb-storage-modules b/helpers/DATA/linux/d-i/modules/amd64/usb-storage-modules
new file mode 100644
index 00000000..8c5e81b5
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/helpers/DATA/linux/d-i/modules/arm64/isofs-modules b/helpers/DATA/linux/d-i/modules/arm64/isofs-modules
new file mode 100644
index 00000000..da4fa9a3
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/arm64/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/helpers/DATA/linux/d-i/modules/arm64/scsi-core-modules b/helpers/DATA/linux/d-i/modules/arm64/scsi-core-modules
new file mode 100644
index 00000000..dd65d661
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/arm64/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/helpers/DATA/linux/d-i/modules/arm64/usb-storage-modules b/helpers/DATA/linux/d-i/modules/arm64/usb-storage-modules
new file mode 100644
index 00000000..8c5e81b5
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/arm64/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/helpers/DATA/linux/d-i/modules/armhf/isofs-modules b/helpers/DATA/linux/d-i/modules/armhf/isofs-modules
new file mode 100644
index 00000000..da4fa9a3
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/armhf/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/helpers/DATA/linux/d-i/modules/armhf/scsi-core-modules b/helpers/DATA/linux/d-i/modules/armhf/scsi-core-modules
new file mode 100644
index 00000000..dd65d661
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/armhf/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/helpers/DATA/linux/d-i/modules/armhf/usb-storage-modules b/helpers/DATA/linux/d-i/modules/armhf/usb-storage-modules
new file mode 100644
index 00000000..8c5e81b5
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/armhf/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/isofs-modules b/helpers/DATA/linux/d-i/modules/i386-virtual/isofs-modules
new file mode 100644
index 00000000..da4fa9a3
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386-virtual/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/scsi-core-modules b/helpers/DATA/linux/d-i/modules/i386-virtual/scsi-core-modules
new file mode 100644
index 00000000..778a022f
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386-virtual/scsi-core-modules
@@ -0,0 +1,4 @@
+#include <scsi-core-modules>
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/usb-storage-modules b/helpers/DATA/linux/d-i/modules/i386-virtual/usb-storage-modules
new file mode 100644
index 00000000..8c5e81b5
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386-virtual/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/helpers/DATA/linux/d-i/modules/i386/isofs-modules b/helpers/DATA/linux/d-i/modules/i386/isofs-modules
new file mode 100644
index 00000000..da4fa9a3
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/helpers/DATA/linux/d-i/modules/i386/scsi-core-modules b/helpers/DATA/linux/d-i/modules/i386/scsi-core-modules
new file mode 100644
index 00000000..778a022f
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386/scsi-core-modules
@@ -0,0 +1,4 @@
+#include <scsi-core-modules>
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc
diff --git a/helpers/DATA/linux/d-i/modules/i386/usb-storage-modules b/helpers/DATA/linux/d-i/modules/i386/usb-storage-modules
new file mode 100644
index 00000000..8c5e81b5
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/helpers/DATA/linux/d-i/modules/isofs-modules b/helpers/DATA/linux/d-i/modules/isofs-modules
new file mode 100644
index 00000000..0f41779b
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/isofs-modules
@@ -0,0 +1 @@
+isofs
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/isofs-modules b/helpers/DATA/linux/d-i/modules/ppc64el/isofs-modules
new file mode 100644
index 00000000..da4fa9a3
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/ppc64el/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/scsi-core-modules b/helpers/DATA/linux/d-i/modules/ppc64el/scsi-core-modules
new file mode 100644
index 00000000..dd65d661
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/ppc64el/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/usb-storage-modules b/helpers/DATA/linux/d-i/modules/ppc64el/usb-storage-modules
new file mode 100644
index 00000000..8c5e81b5
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/ppc64el/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/helpers/DATA/linux/d-i/modules/s390x/isofs-modules b/helpers/DATA/linux/d-i/modules/s390x/isofs-modules
new file mode 100644
index 00000000..da4fa9a3
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/s390x/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/helpers/DATA/linux/d-i/modules/s390x/scsi-core-modules b/helpers/DATA/linux/d-i/modules/s390x/scsi-core-modules
new file mode 100644
index 00000000..dd65d661
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/s390x/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/helpers/DATA/linux/d-i/modules/scsi-core-modules b/helpers/DATA/linux/d-i/modules/scsi-core-modules
new file mode 100644
index 00000000..e0d1d8fc
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/scsi-core-modules
@@ -0,0 +1,4 @@
+scsi_mod
+sd_mod
+scsi_transport_sas ?
+scsi_transport_spi ?
diff --git a/helpers/DATA/linux/d-i/modules/usb-storage-modules b/helpers/DATA/linux/d-i/modules/usb-storage-modules
new file mode 100644
index 00000000..013c58cf
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/usb-storage-modules
@@ -0,0 +1,2 @@
+# Include USB storage drivers by default
+drivers/usb/storage/*
diff --git a/helpers/DATA/linux/d-i/package-list b/helpers/DATA/linux/d-i/package-list
index 10759109..082282a2 100644
--- a/helpers/DATA/linux/d-i/package-list
+++ b/helpers/DATA/linux/d-i/package-list
@@ -45,7 +45,7 @@ Description: Base filesystem modules
  This includes jfs, reiserfs and xfs.
 
 Package: fs-secondary-modules
-Depends: kernel-image, fat-modules
+Depends: kernel-image, fat-modules, cdrom-core-modules
 Priority: standard
 Provides: btrfs-modules, ntfs-modules, hfs-modules
 Description: Extra filesystem modules
@@ -114,12 +114,12 @@ Priority: standard
 Description: PPP (serial port) networking support
 
 Package: sata-modules
-Depends: kernel-image, storage-core-modules
+Depends: kernel-image, storage-core-modules, scsi-core-modules
 Priority: standard
 Description: SATA storage support
 
 Package: scsi-modules
-Depends: kernel-image, storage-core-modules
+Depends: kernel-image, storage-core-modules, scsi-core-modules
 Priority: standard
 Description: SCSI storage support
 
@@ -196,8 +196,26 @@ Priority: standard
 Description: ipmi modules
 
 Package: multipath-modules
-Depends: kernel-image
+Depends: kernel-image, scsi-core-modules
 Priority: extra
 Description: DM-Multipath support
   This package contains modules for device-mapper multipath support.
 
+Package: isofs-modules
+Depends: kernel-image, cdrom-core-modules
+Priority: standard
+Description: ISOFS filesystem support
+ This package contains the ISOFS filesystem module for the kernel.
+
+Package: usb-storage-modules
+Depends: kernel-image, scsi-core-modules, usb-modules
+Priority: standard
+Description: USB storage support
+ This package contains the USB storage driver for the kernel.
+
+Package: scsi-core-modules
+Depends: kernel-image
+Provides: cdrom-core-modules
+Priority: standard
+Description: Core SCSI subsystem
+ This package contains the core SCSI subsystem for the kernel.
diff --git a/helpers/make-linux b/helpers/make-linux
index a68ecf48..da8bfb4c 100644
--- a/helpers/make-linux
+++ b/helpers/make-linux
@@ -20,7 +20,6 @@
 #
 
 VERSION=12
-
 . ./config
 
 for PATCH in $DATA/*.patch ; do
-- 
GitLab