Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.kernel > #52972 > unrolled thread

Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288.

Back to article view | Back to linux.debian.kernel

Contents

  Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288. Vagrant Cascadian <vagrant@debian.org> - 2016-02-21 21:30 +0100
    Processed: Re: Bug#815476: linux: [armhf] udeb: Add modules  needed on Firefly-RK3288. owner@bugs.debian.org (Debian Bug Tracking System) - 2016-02-22 01:00 +0100
    Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288. Ben Hutchings <ben@decadent.org.uk> - 2016-02-22 01:00 +0100
      Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288. Vagrant Cascadian <vagrant@debian.org> - 2016-02-22 01:20 +0100
        Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288. Ben Hutchings <ben@decadent.org.uk> - 2016-02-22 02:20 +0100
          Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288. Vagrant Cascadian <vagrant@debian.org> - 2016-02-22 09:20 +0100
            Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288. Ben Hutchings <ben@decadent.org.uk> - 2016-02-22 10:50 +0100
              Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288. Vagrant Cascadian <vagrant@debian.org> - 2016-02-23 21:40 +0100
                Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288. Vagrant Cascadian <vagrant@debian.org> - 2016-02-24 00:30 +0100
                  Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288. Ben Hutchings <ben@decadent.org.uk> - 2016-02-24 02:00 +0100

#52972 — Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288.

[Multipart message — attachments visible in raw view] — view raw

Source: linux
Version: 4.4.2-2
Severity: normal
Tags: patch

The following modules are needed in order to support ethernet, USB,
and MMC on Firefly-RK3288 in debian-installer.

Please consider enabling them!

live well,
  vagrant


commit 60653f57a9eac67bfde342604fb0adf5b4e2d359
Author: Vagrant Cascadian <vagrant@debian.org>
Date:   Sun Feb 21 12:08:28 2016 -0800

    [armhf] udeb: Add modules needed on Firefly-RK3288.
    - Add act8865-regulator to core-modules
    - Add dw_mmc-rockchip to mmc-modules
    - Add phy-rockchip-usb to usb-modules

diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
index 7ea5f6d..3128393 100644
--- a/debian/installer/armhf/modules/armhf-armmp/core-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
@@ -14,6 +14,7 @@ phy-omap-control ?
 phy-ti-pipe3 ?
 
 # Regulators
+act8865-regulator ?
 anatop-regulator ?
 axp20x-regulator ?
 da9052-regulator ?
diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
index 287ff3f..6bdda66 100644
--- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
@@ -5,4 +5,5 @@ mmci
 omap_hsmmc
 sunxi-mmc
 dw_mmc-exynos
+dw_mmc-rockchip
 sdhci-bcm2835
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/armhf/modules/armhf-armmp/usb-modules
index 663e915..454e77d 100644
--- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
@@ -18,6 +18,7 @@ phy-exynos5-usbdrd ?
 phy-generic ?
 phy-mxs-usb
 phy-omap-usb2
+phy-rockchip-usb
 phy-sun4i-usb
 phy-sun9i-usb ?
 phy-tegra-usb ?

[toc] | [next] | [standalone]

#52975 — Processed: Re: Bug#815476: linux: [armhf] udeb: Add modules needed on Firefly-RK3288.

Processing control commands:

> tag -1 moreinfo
Bug #815476 [src:linux] linux: [armhf] udeb: Add modules needed on Firefly-RK3288.
Added tag(s) moreinfo.

-- 
815476: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815476
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems

[toc] | [prev] | [next] | [standalone]

#52976

[Multipart message — attachments visible in raw view] — view raw

Control: tag -1 moreinfo

On Sun, 2016-02-21 at 12:24 -0800, Vagrant Cascadian wrote:
> Source: linux
> Version: 4.4.2-2
> Severity: normal
> Tags: patch
> 
> The following modules are needed in order to support ethernet, USB,
> and MMC on Firefly-RK3288 in debian-installer.
> 
> Please consider enabling them!
> 
> live well,
>   vagrant
> 
> 
> commit 60653f57a9eac67bfde342604fb0adf5b4e2d359
> Author: Vagrant Cascadian <vagrant@debian.org>
> Date:   Sun Feb 21 12:08:28 2016 -0800
> 
>     [armhf] udeb: Add modules needed on Firefly-RK3288.
>     - Add act8865-regulator to core-modules
>     - Add dw_mmc-rockchip to mmc-modules
>     - Add phy-rockchip-usb to usb-modules
> 
> diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
> index 7ea5f6d..3128393 100644
> --- a/debian/installer/armhf/modules/armhf-armmp/core-modules
> +++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
> @@ -14,6 +14,7 @@ phy-omap-control ?
>  phy-ti-pipe3 ?
>  
>  # Regulators
> +act8865-regulator ?
>  anatop-regulator ?
>  axp20x-regulator ?
>  da9052-regulator ?
> diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
> index 287ff3f..6bdda66 100644
> --- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
> +++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
> @@ -5,4 +5,5 @@ mmci
>  omap_hsmmc
>  sunxi-mmc
>  dw_mmc-exynos
> +dw_mmc-rockchip
>  sdhci-bcm2835

Would it make sense to replace this list with a wildcard in the default
mmc-modules file:

    drivers/mmc/host/**

> diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/armhf/modules/armhf-armmp/usb-modules
> index 663e915..454e77d 100644
> --- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
> +++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
> @@ -18,6 +18,7 @@ phy-exynos5-usbdrd ?
>  phy-generic ?
>  phy-mxs-usb
>  phy-omap-usb2
> +phy-rockchip-usb
>  phy-sun4i-usb
>  phy-sun9i-usb ?
>  phy-tegra-usb ?

Would it make sense to replace this list with wildcards in the default
usb-modules file:

    drivers/phy/phy-*-usb ?
    drivers/usb/phy/* ?

Ben.

-- 
Ben Hutchings
Time is nature's way of making sure that everything doesn't happen at once.

[toc] | [prev] | [next] | [standalone]

#52977

[Multipart message — attachments visible in raw view] — view raw

On 2016-02-21, Ben Hutchings wrote:
>> --- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
>> +++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
>> @@ -5,4 +5,5 @@ mmci
>>  omap_hsmmc
>>  sunxi-mmc
>>  dw_mmc-exynos
>> +dw_mmc-rockchip
>>  sdhci-bcm2835
>
> Would it make sense to replace this list with a wildcard in the default
> mmc-modules file:
>
>     drivers/mmc/host/**

Overall, I like the idea of using wildcards to include enabled drivers
by default, so that drivers for new platforms get automatically
included.

The only downside I see, is if a driver was accidentally disabled in the
config (or due to some new conflicting config), it will happily produce
a package without that driver...

The obvious advantage is it will likely reduce the number of round-trip
bug reports to enable drivers in both the kernel and the udebs, so I'd
be supportive of using wildcards for that reason.


live well,
  vagrant

[toc] | [prev] | [next] | [standalone]

#52981

[Multipart message — attachments visible in raw view] — view raw

On Sun, 2016-02-21 at 16:11 -0800, Vagrant Cascadian wrote:
> On 2016-02-21, Ben Hutchings wrote:
> > > --- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
> > > +++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
> > > @@ -5,4 +5,5 @@ mmci
> > >  omap_hsmmc
> > >  sunxi-mmc
> > >  dw_mmc-exynos
> > > +dw_mmc-rockchip
> > >  sdhci-bcm2835
> > 
> > Would it make sense to replace this list with a wildcard in the default
> > mmc-modules file:
> > 
> >     drivers/mmc/host/**
> 
> Overall, I like the idea of using wildcards to include enabled drivers
> by default, so that drivers for new platforms get automatically
> included.
> 
> The only downside I see, is if a driver was accidentally disabled in the
> config (or due to some new conflicting config), it will happily produce
> a package without that driver...

I think we should add something to buildcheck.py to find unexpectedly
dropped drivers.  But that is independent of whether drivers belong in
any particular udeb, or are needed at installation time at all.

> The obvious advantage is it will likely reduce the number of round-trip
> bug reports to enable drivers in both the kernel and the udebs, so I'd
> be supportive of using wildcards for that reason.

Please can you test whether that change would do the right thing for armhf.

Ben.

-- 
Ben Hutchings
The generation of random numbers is too important to be left to chance.
                                                            - Robert Coveyou

[toc] | [prev] | [next] | [standalone]

#52983

[Multipart message — attachments visible in raw view] — view raw

On 2016-02-21, Ben Hutchings wrote:
> On Sun, 2016-02-21 at 16:11 -0800, Vagrant Cascadian wrote:
>> On 2016-02-21, Ben Hutchings wrote:
>> > > --- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
>> > > +++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
>> > > @@ -5,4 +5,5 @@ mmci
>> > >  omap_hsmmc
>> > >  sunxi-mmc
>> > >  dw_mmc-exynos
>> > > +dw_mmc-rockchip
>> > >  sdhci-bcm2835
>> > 
>> > Would it make sense to replace this list with a wildcard in the default
>> > mmc-modules file:
>> > 
>> >     drivers/mmc/host/**
>> 
>> Overall, I like the idea of using wildcards to include enabled drivers
>> by default, so that drivers for new platforms get automatically
>> included.
...
> Please can you test whether that change would do the right thing for armhf.

First attempt resulted in:

        kernel-wedge find-dups 4.4.0-1-armmp
some modules are in more than one package
debian/usb-modules-4.4.0-1-armmp-di
lib/modules/4.4.0-1-armmp/kernel/drivers/usb/common/usb-common.ko
debian/mmc-modules-4.4.0-1-armmp-di
lib/modules/4.4.0-1-armmp/kernel/drivers/usb/common/usb-common.ko
debian/usb-modules-4.4.0-1-armmp-di
lib/modules/4.4.0-1-armmp/kernel/drivers/usb/core/usbcore.ko
debian/mmc-modules-4.4.0-1-armmp-di
lib/modules/4.4.0-1-armmp/kernel/drivers/usb/core/usbcore.ko
command exited with status 1
make[2]: *** [install-udeb_armhf] Error 2
debian/rules.real:449: recipe for target 'install-udeb_armhf' failed

That was using the following patch:

diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
index 7ea5f6d..4c26273 100644
--- a/debian/installer/armhf/modules/armhf-armmp/core-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
@@ -14,16 +14,8 @@ phy-omap-control ?
 phy-ti-pipe3 ?
 
 # Regulators
-anatop-regulator ?
-axp20x-regulator ?
-da9052-regulator ?
-gpio-regulator ?
-mc13783-regulator ?
-mc13892-regulator ?
-pbias-regulator
-pfuze100-regulator ?
+drivers/regulators/*-regulator ?
 s2mpa01 ?
 s2mps11 ?
 s5m8767 ?
-ti-abb-regulator ?
 vexpress ?
diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
index 287ff3f..dadfd53 100644
--- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
@@ -1,8 +1 @@
 #include <mmc-modules>
-sdhci-esdhc-imx
-sdhci-tegra
-mmci
-omap_hsmmc
-sunxi-mmc
-dw_mmc-exynos
-sdhci-bcm2835
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/armhf/modules/armhf-armmp/usb-modules
index 663e915..2e14200 100644
--- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
@@ -10,16 +10,4 @@ ehci-tegra
 ci_hdrc_imx
 dwc2
 
-# USB PHYs
-phy-am335x ?
-phy-am335x-control ?
-phy-exynos-usb2
-phy-exynos5-usbdrd ?
-phy-generic ?
-phy-mxs-usb
-phy-omap-usb2
-phy-sun4i-usb
-phy-sun9i-usb ?
-phy-tegra-usb ?
-phy-twl4030-usb ?
-phy-twl6030-usb ?
+# USB PHYs included in usb-modules
diff --git a/debian/installer/modules/mmc-modules b/debian/installer/modules/mmc-modules
index ce8b176..4367117 100644
--- a/debian/installer/modules/mmc-modules
+++ b/debian/installer/modules/mmc-modules
@@ -7,3 +7,4 @@ tifm_sd ?
 dw_mmc ?
 dw_mmc_pltfm ?
 toshsd ?
+drivers/mmc/host/**
\ No newline at end of file
diff --git a/debian/installer/modules/usb-modules b/debian/installer/modules/usb-modules
index 3198f10..af92252 100644
--- a/debian/installer/modules/usb-modules
+++ b/debian/installer/modules/usb-modules
@@ -7,3 +7,7 @@ sl811_cs -
 sl811-hcd -
 u132-hcd -
 whci-hcd -
+
+# Include USB PHY drivers by default
+drivers/phy/phy-*-usb ?
+drivers/usb/phy/* ?


live well,
  vagrant

[toc] | [prev] | [next] | [standalone]

#52984

[Multipart message — attachments visible in raw view] — view raw

On Mon, 2016-02-22 at 00:08 -0800, Vagrant Cascadian wrote:
> On 2016-02-21, Ben Hutchings wrote:
> > On Sun, 2016-02-21 at 16:11 -0800, Vagrant Cascadian wrote:
> > > On 2016-02-21, Ben Hutchings wrote:
> > > > > --- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
> > > > > +++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
> > > > > @@ -5,4 +5,5 @@ mmci
> > > > >  omap_hsmmc
> > > > >  sunxi-mmc
> > > > >  dw_mmc-exynos
> > > > > +dw_mmc-rockchip
> > > > >  sdhci-bcm2835
> > > > 
> > > > Would it make sense to replace this list with a wildcard in the default
> > > > mmc-modules file:
> > > > 
> > > >     drivers/mmc/host/**
> > > 
> > > Overall, I like the idea of using wildcards to include enabled drivers
> > > by default, so that drivers for new platforms get automatically
> > > included.
> ...
> > Please can you test whether that change would do the right thing for armhf.
> 
> First attempt resulted in:
> 
>         kernel-wedge find-dups 4.4.0-1-armmp
> some modules are in more than one package
> debian/usb-modules-4.4.0-1-armmp-di
> lib/modules/4.4.0-1-armmp/kernel/drivers/usb/common/usb-common.ko
> debian/mmc-modules-4.4.0-1-armmp-di
> lib/modules/4.4.0-1-armmp/kernel/drivers/usb/common/usb-common.ko
> debian/usb-modules-4.4.0-1-armmp-di
> lib/modules/4.4.0-1-armmp/kernel/drivers/usb/core/usbcore.ko
> debian/mmc-modules-4.4.0-1-armmp-di
> lib/modules/4.4.0-1-armmp/kernel/drivers/usb/core/usbcore.ko
> command exited with status 1
> make[2]: *** [install-udeb_armhf] Error 2
> debian/rules.real:449: recipe for target 'install-udeb_armhf' failed
[...]

We need to either exclude the USB-attached MMC host controllers from
mmc-modules:

ushc -
vub300 -

or make mmc-modules depend on usb-modules.

Ben.

-- 
Ben Hutchings
The generation of random numbers is too important to be left to chance.
                                                            - Robert Coveyou

[toc] | [prev] | [next] | [standalone]

#53003

[Multipart message — attachments visible in raw view] — view raw

On 2016-02-22, Ben Hutchings wrote:
> We need to either exclude the USB-attached MMC host controllers from
> mmc-modules:
>
> ushc -
> vub300 -

That still needed more exclusions; I didn't track them all down...

> or make mmc-modules depend on usb-modules.

Adding usb-modules dependency worked better, or at least, didn't FTBFS.

With a couple more changes (there were some phy-usb modules missing),
the patch below adds the additional modules needed for rockchip and a
few others. Tried adding wildcards for the regulator modules, but was
unsuccessful. Checked the result against a debdiff of mmc-modules,
usb-modules and core-modules:

usb-modules
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-------------------------------------
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/phy/phy-rockchip-usb.ko

Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-1726-] {+1732+}
Version: [-4.4.2-3-] {+4.4.2-4~20160223~3+}

core-modules
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-------------------------------------
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/regulator/act8865-regulator.ko

Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-396-] {+417+}
Version: [-4.4.2-3-] {+4.4.2-4~20160223~3+}

mmc-modules
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-------------------------------------
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mfd/rtsx_pci.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mfd/rtsx_usb.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/misc/cb710/cb710.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/cb710-mmc.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/dw_mmc-rockchip.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/mvsdio.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/omap.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/rtsx_pci_sdmmc.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/rtsx_usb_sdmmc.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/ushc.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/via-sdmmc.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/vub300.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/wmt-sdmmc.ko

Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: kernel-image-4.4.0-1-armmp-di, [-core-modules-4.4.0-1-armmp-di-] {+core-modules-4.4.0-1-armmp-di, usb-modules-4.4.0-1-armmp-di+}
Installed-Size: [-403-] {+768+}
Version: [-4.4.2-3-] {+4.4.2-4~20160223~3+}



diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
index 7ea5f6d..3128393 100644
--- a/debian/installer/armhf/modules/armhf-armmp/core-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
@@ -14,6 +14,7 @@ phy-omap-control ?
 phy-ti-pipe3 ?
 
 # Regulators
+act8865-regulator ?
 anatop-regulator ?
 axp20x-regulator ?
 da9052-regulator ?
diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
index 287ff3f..dadfd53 100644
--- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
@@ -1,8 +1 @@
 #include <mmc-modules>
-sdhci-esdhc-imx
-sdhci-tegra
-mmci
-omap_hsmmc
-sunxi-mmc
-dw_mmc-exynos
-sdhci-bcm2835
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/armhf/modules/armhf-armmp/usb-modules
index 663e915..7861c82 100644
--- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
@@ -9,17 +9,3 @@ ehci-orion
 ehci-tegra
 ci_hdrc_imx
 dwc2
-
-# USB PHYs
-phy-am335x ?
-phy-am335x-control ?
-phy-exynos-usb2
-phy-exynos5-usbdrd ?
-phy-generic ?
-phy-mxs-usb
-phy-omap-usb2
-phy-sun4i-usb
-phy-sun9i-usb ?
-phy-tegra-usb ?
-phy-twl4030-usb ?
-phy-twl6030-usb ?
diff --git a/debian/installer/modules/mmc-modules b/debian/installer/modules/mmc-modules
index ce8b176..0bae54e 100644
--- a/debian/installer/modules/mmc-modules
+++ b/debian/installer/modules/mmc-modules
@@ -7,3 +7,4 @@ tifm_sd ?
 dw_mmc ?
 dw_mmc_pltfm ?
 toshsd ?
+drivers/mmc/host/**
diff --git a/debian/installer/modules/usb-modules b/debian/installer/modules/usb-modules
index 3198f10..7e87f81 100644
--- a/debian/installer/modules/usb-modules
+++ b/debian/installer/modules/usb-modules
@@ -7,3 +7,7 @@ sl811_cs -
 sl811-hcd -
 u132-hcd -
 whci-hcd -
+
+# Include USB PHY drivers by default
+drivers/phy/phy-*-usb* ?
+drivers/usb/phy/* ?
diff --git a/debian/installer/package-list b/debian/installer/package-list
index 74dfeb1..f51c443 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -300,7 +300,7 @@ Description: MMC/SD/SDIO core modules
  This package contains core modules for MMC/SD/SDIO support.
 
 Package: mmc-modules
-Depends: kernel-image, core-modules, mmc-core-modules
+Depends: kernel-image, core-modules, mmc-core-modules, usb-modules
 Priority: extra
 Description: MMC/SD card modules
  This package contains modules needed to support MMC (multimedia) and

[toc] | [prev] | [next] | [standalone]

#53005

[Multipart message — attachments visible in raw view] — view raw

On 2016-02-23, Vagrant Cascadian wrote:
> With a couple more changes (there were some phy-usb modules missing),
> the patch below adds the additional modules needed for rockchip and a
> few others. Tried adding wildcards for the regulator modules, but was
> unsuccessful. 

This patch handles regulator modules in the core-modules udeb as well:

diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
index 3128393..ff4ff9f 100644
--- a/debian/installer/armhf/modules/armhf-armmp/core-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
@@ -14,17 +14,4 @@ phy-omap-control ?
 phy-ti-pipe3 ?
 
 # Regulators
-act8865-regulator ?
-anatop-regulator ?
-axp20x-regulator ?
-da9052-regulator ?
-gpio-regulator ?
-mc13783-regulator ?
-mc13892-regulator ?
-pbias-regulator
-pfuze100-regulator ?
-s2mpa01 ?
-s2mps11 ?
-s5m8767 ?
-ti-abb-regulator ?
-vexpress ?
+drivers/regulator/**


debdiff:

core-modules
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-------------------------------------
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/regulator/act8865-regulator.ko
-rw-r--r--  root/root   /lib/modules/4.4.0-1-armmp/kernel/drivers/regulator/fan53555.ko

Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-396-] {+429+}
Version: [-4.4.2-3-] {+4.4.2-4~20160223~5+}

[toc] | [prev] | [next] | [standalone]

#53008

[Multipart message — attachments visible in raw view] — view raw

On Tue, 2016-02-23 at 15:19 -0800, Vagrant Cascadian wrote:
> On 2016-02-23, Vagrant Cascadian wrote:
> > With a couple more changes (there were some phy-usb modules missing),
> > the patch below adds the additional modules needed for rockchip and a
> > few others. Tried adding wildcards for the regulator modules, but was
> > unsuccessful. 
> 
> This patch handles regulator modules in the core-modules udeb as well:
[...]

I've applied both patches.  In answer to your question:

17:50 < vagrantc> where's it documented what regexes are valid for 
                  debian/installer/*-modules ?
17:50 < vagrantc> that's kernel-wedge that handles that?
17:51 < vagrantc> notably, what's the difference between ** and * ?

Running 'kernel-wedge help preprocess' shows brief documentation of
this.

(What's lacking, of course, is the explanation of how the different
sub-commands work together - I had to check which one it was, and I
only just added that feature!)

Ben.

-- 
Ben Hutchings
Beware of programmers who carry screwdrivers. - Leonard Brandwein

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.kernel

csiph-web