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 0000000..da4fa9a --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/amd64-virtual/isofs-modules @@ -0,0 +1 @@ +#include 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 0000000..778a022 --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-core-modules @@ -0,0 +1,4 @@ +#include + +# 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 0000000..8c5e81b --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/amd64-virtual/usb-storage-modules @@ -0,0 +1 @@ +#include 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 0000000..da4fa9a --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/amd64/isofs-modules @@ -0,0 +1 @@ +#include 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 0000000..778a022 --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/amd64/scsi-core-modules @@ -0,0 +1,4 @@ +#include + +# 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 0000000..8c5e81b --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/amd64/usb-storage-modules @@ -0,0 +1 @@ +#include 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 0000000..da4fa9a --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/arm64/isofs-modules @@ -0,0 +1 @@ +#include 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 0000000..dd65d66 --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/arm64/scsi-core-modules @@ -0,0 +1 @@ +#include 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 0000000..8c5e81b --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/arm64/usb-storage-modules @@ -0,0 +1 @@ +#include 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 0000000..da4fa9a --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/armhf/isofs-modules @@ -0,0 +1 @@ +#include 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 0000000..dd65d66 --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/armhf/scsi-core-modules @@ -0,0 +1 @@ +#include 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 0000000..8c5e81b --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/armhf/usb-storage-modules @@ -0,0 +1 @@ +#include 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 0000000..da4fa9a --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/i386-virtual/isofs-modules @@ -0,0 +1 @@ +#include 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 0000000..778a022 --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/i386-virtual/scsi-core-modules @@ -0,0 +1,4 @@ +#include + +# 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 0000000..8c5e81b --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/i386-virtual/usb-storage-modules @@ -0,0 +1 @@ +#include 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 0000000..da4fa9a --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/i386/isofs-modules @@ -0,0 +1 @@ +#include 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 0000000..778a022 --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/i386/scsi-core-modules @@ -0,0 +1,4 @@ +#include + +# 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 0000000..8c5e81b --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/i386/usb-storage-modules @@ -0,0 +1 @@ +#include 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 0000000..0f41779 --- /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 0000000..da4fa9a --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/ppc64el/isofs-modules @@ -0,0 +1 @@ +#include 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 0000000..dd65d66 --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/ppc64el/scsi-core-modules @@ -0,0 +1 @@ +#include 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 0000000..8c5e81b --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/ppc64el/usb-storage-modules @@ -0,0 +1 @@ +#include 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 0000000..da4fa9a --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/s390x/isofs-modules @@ -0,0 +1 @@ +#include 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 0000000..dd65d66 --- /dev/null +++ b/helpers/DATA/linux/d-i/modules/s390x/scsi-core-modules @@ -0,0 +1 @@ +#include 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 0000000..e0d1d8f --- /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 0000000..013c58c --- /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 1075910..082282a 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 a68ecf4..da8bfb4 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -20,7 +20,6 @@ # VERSION=12 - . ./config for PATCH in $DATA/*.patch ; do