diff --git a/helpers/DATA/linux/d-i/modules/armhf/i2c-modules b/helpers/DATA/linux/d-i/modules/armhf/i2c-modules index b027964..feb2d8f 100644 --- a/helpers/DATA/linux/d-i/modules/armhf/i2c-modules +++ b/helpers/DATA/linux/d-i/modules/armhf/i2c-modules @@ -1,4 +1,4 @@ #include -i2c-exynos5 +i2c-exynos5 ? i2c-mv64xxx i2c-rk3x diff --git a/helpers/DATA/linux/d-i/modules/input-modules b/helpers/DATA/linux/d-i/modules/input-modules index c6e1c7d..ade7913 100644 --- a/helpers/DATA/linux/d-i/modules/input-modules +++ b/helpers/DATA/linux/d-i/modules/input-modules @@ -69,3 +69,7 @@ hid-xinmo ? hid-zydacron ? uhid ? usbhid ? +drivers/hid/** +drivers/input/keyboard/** ? +drivers/hid/hid-*ff - +drivers/hid/hid-roccat-ko* - diff --git a/helpers/DATA/linux/d-i/modules/multipath-modules b/helpers/DATA/linux/d-i/modules/multipath-modules index 6e4fad7..51b21b2 100644 --- a/helpers/DATA/linux/d-i/modules/multipath-modules +++ b/helpers/DATA/linux/d-i/modules/multipath-modules @@ -2,3 +2,4 @@ dm-multipath ? dm-round-robin ? dm-service-time ? dm-queue-length ? +drivers/scsi/device_handler/* diff --git a/helpers/DATA/linux/d-i/modules/nic-modules b/helpers/DATA/linux/d-i/modules/nic-modules index e362839..fa9673e 100644 --- a/helpers/DATA/linux/d-i/modules/nic-modules +++ b/helpers/DATA/linux/d-i/modules/nic-modules @@ -207,3 +207,9 @@ znet ? vmxnet3 ? xen-netfront ? xgene-enet ? +drivers/net/dsa/** ? +drivers/net/ethernet/** +drivers/net/**_cs - +drivers/net/wireless/** +drivers/staging/rtl8** ? +drivers/net/wireless/**_cs - diff --git a/helpers/DATA/linux/d-i/modules/nic-pcmcia-modules b/helpers/DATA/linux/d-i/modules/nic-pcmcia-modules index 1916875..759e36a 100644 --- a/helpers/DATA/linux/d-i/modules/nic-pcmcia-modules +++ b/helpers/DATA/linux/d-i/modules/nic-pcmcia-modules @@ -17,3 +17,5 @@ wl3501_cs ? xirc2ps_cs ? xircom_cb ? xircom_tulip_cb ? +drivers/net/ethernet/**_cs +drivers/net/wireless/**_cs diff --git a/helpers/DATA/linux/d-i/modules/nic-shared-modules b/helpers/DATA/linux/d-i/modules/nic-shared-modules index 0ee15aa..c2ef43f 100644 --- a/helpers/DATA/linux/d-i/modules/nic-shared-modules +++ b/helpers/DATA/linux/d-i/modules/nic-shared-modules @@ -24,3 +24,4 @@ cfg80211 ? lib80211_crypt_ccmp ? lib80211_crypt_tkip ? lib80211_crypt_wep ? +drivers/net/phy/** diff --git a/helpers/DATA/linux/d-i/modules/nic-usb-modules b/helpers/DATA/linux/d-i/modules/nic-usb-modules index 93d3d8c..36b82b5 100644 --- a/helpers/DATA/linux/d-i/modules/nic-usb-modules +++ b/helpers/DATA/linux/d-i/modules/nic-usb-modules @@ -32,3 +32,4 @@ zaurus ? carl9170 ? smsc75xx ? smsc95xx ? +drivers/net/usb/* diff --git a/helpers/DATA/linux/d-i/modules/pata-modules b/helpers/DATA/linux/d-i/modules/pata-modules index a58c30a..9c9c640 100644 --- a/helpers/DATA/linux/d-i/modules/pata-modules +++ b/helpers/DATA/linux/d-i/modules/pata-modules @@ -1,47 +1,48 @@ -pata_ali.ko ? -pata_amd.ko ? -pata_artop.ko ? -pata_atiixp.ko ? -pata_atp867x.ko ? -pata_cmd640.ko ? -pata_cmd64x.ko ? -pata_cs5520.ko ? -pata_cs5530.ko ? -pata_cs5535.ko ? -pata_cs5536.ko ? -pata_cypress.ko ? -pata_efar.ko ? -pata_hpt366.ko ? -pata_hpt37x.ko ? -pata_hpt3x2n.ko ? -pata_hpt3x3.ko ? -pata_isapnp.ko ? -pata_it8213.ko ? -pata_it821x.ko ? -pata_jmicron.ko ? -pata_legacy.ko ? -pata_macio.ko ? -pata_marvell.ko ? -pata_mpiix.ko ? -pata_netcell.ko ? -pata_ninja32.ko ? -pata_ns87410.ko ? -pata_ns87415.ko ? -pata_oldpiix.ko ? -pata_optidma.ko ? -pata_opti.ko ? -pata_pcmcia.ko ? -pata_pdc2027x.ko ? -pata_pdc202xx_old.ko ? -pata_qdi.ko ? -pata_radisys.ko ? -pata_rdc.ko ? -pata_rz1000.ko ? -pata_sc1200.ko ? -pata_sch.ko ? -pata_serverworks.ko ? -pata_sil680.ko ? -pata_sl82c105.ko ? -pata_triflex.ko ? -pata_via.ko ? -pata_winbond.ko ? +pata_ali ? +pata_amd ? +pata_artop ? +pata_atiixp ? +pata_atp867x ? +pata_cmd640 ? +pata_cmd64x ? +pata_cs5520 ? +pata_cs5530 ? +pata_cs5535 ? +pata_cs5536 ? +pata_cypress ? +pata_efar ? +pata_hpt366 ? +pata_hpt37x ? +pata_hpt3x2n ? +pata_hpt3x3 ? +pata_isapnp ? +pata_it8213 ? +pata_it821x ? +pata_jmicron ? +pata_legacy ? +pata_macio ? +pata_marvell ? +pata_mpiix ? +pata_netcell ? +pata_ninja32 ? +pata_ns87410 ? +pata_ns87415 ? +pata_oldpiix ? +pata_optidma ? +pata_opti ? +pata_pcmcia ? +pata_pdc2027x ? +pata_pdc202xx_old ? +pata_qdi ? +pata_radisys ? +pata_rdc ? +pata_rz1000 ? +pata_sc1200 ? +pata_sch ? +pata_serverworks ? +pata_sil680 ? +pata_sl82c105 ? +pata_triflex ? +pata_via ? +pata_winbond ? +drivers/ata/pata_* diff --git a/helpers/DATA/linux/d-i/modules/sata-modules b/helpers/DATA/linux/d-i/modules/sata-modules index 6a4171d..151319b 100644 --- a/helpers/DATA/linux/d-i/modules/sata-modules +++ b/helpers/DATA/linux/d-i/modules/sata-modules @@ -1,18 +1,20 @@ -sata_inic162x.ko ? -sata_mv.ko ? -sata_nv.ko ? -sata_promise.ko ? -sata_qstor.ko ? -sata_sil24.ko ? -sata_sil.ko ? -sata_sis.ko ? -sata_svw.ko ? -sata_sx4.ko ? -sata_uli.ko ? -sata_via.ko ? -sata_vsc.ko ? +sata_inic162x ? +sata_mv ? +sata_nv ? +sata_promise ? +sata_qstor ? +sata_sil24 ? +sata_sil ? +sata_sis ? +sata_svw ? +sata_sx4 ? +sata_uli ? +sata_via ? +sata_vsc ? ahci_platform ? ahci ? acard-ahci ? libahci ? ahci_xgene ? +drivers/ata/ahci* ? +drivers/ata/sata_* diff --git a/helpers/DATA/linux/d-i/modules/scsi-modules b/helpers/DATA/linux/d-i/modules/scsi-modules index 66923f3..697bfea 100644 --- a/helpers/DATA/linux/d-i/modules/scsi-modules +++ b/helpers/DATA/linux/d-i/modules/scsi-modules @@ -135,3 +135,10 @@ scsi_dh_rdac ? scsi_dh_hp_sw ? smartpqi ? +drivers/scsi/** +drivers/scsi/pcmcia/* - +drivers/scsi/cxgbi/* - +drivers/scsi/device_handler/* - +drivers/scsi/lib** - +drivers/scsi/osd/* - +drivers/scsi/scsi_transport_* - diff --git a/helpers/DATA/linux/d-i/modules/serial-modules b/helpers/DATA/linux/d-i/modules/serial-modules index cc246d4..5e5cef5 100644 --- a/helpers/DATA/linux/d-i/modules/serial-modules +++ b/helpers/DATA/linux/d-i/modules/serial-modules @@ -3,3 +3,4 @@ generic_serial ? serial_cs ? synclink_cs ? hyperv-keyboard ? +drivers/usb/serial/* diff --git a/helpers/DATA/linux/d-i/modules/storage-core-modules b/helpers/DATA/linux/d-i/modules/storage-core-modules index a1f099d..3d534d2 100644 --- a/helpers/DATA/linux/d-i/modules/storage-core-modules +++ b/helpers/DATA/linux/d-i/modules/storage-core-modules @@ -13,3 +13,5 @@ isofs ? # Needed for NVMe disks under VMD PCIe domains vmd ? +drivers/usb/storage/* +drivers/mmc/host/** diff --git a/helpers/DATA/linux/d-i/modules/usb-modules b/helpers/DATA/linux/d-i/modules/usb-modules index b93a661..0bb89c0 100644 --- a/helpers/DATA/linux/d-i/modules/usb-modules +++ b/helpers/DATA/linux/d-i/modules/usb-modules @@ -13,3 +13,14 @@ ehci-tegra ? ehci-msm ? ehci-platform ? uas ? +drivers/usb/host/** +drivers/usb/c67x00/* ? +drivers/usb/chipidea/* ? +drivers/usb/dwc2/* ? +drivers/usb/dwc3/* ? +drivers/usb/isp1760/* ? +drivers/usb/musb/* ? +drivers/usb/renesas_usbhs/* ? +drivers/phy/phy-*-usb* ? +drivers/phy/*/phy-*-usb* ? +drivers/usb/phy/* ? diff --git a/helpers/make-linux b/helpers/make-linux index c449620..ec6897c 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=23 +VERSION=24 . ./config @@ -76,7 +76,6 @@ done # Re-enable udebs cp $DATA/5-udebs.mk debian/rules.d cp -a $DATA/d-i debian.master -/bin/sed 's/\.ko//' -i debian.master/d-i/modules/*-modules cp $DATA/kernel-wedge-arch.pl debian/scripts/misc/ cat << EOF >> debian/control