diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2016-01-04 00:46:39 +0000 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2016-01-04 00:46:39 +0000 |
commit | 559f1a2447ccf159fd4c169b98da823bf4c9d0df (patch) | |
tree | d1a0e5f6b9f52cb0126cdab8fd3f3ff731078349 | |
parent | bbfa58468df54735f35c9a12643132b294537643 (diff) | |
download | kernel_replicant_linux-559f1a2447ccf159fd4c169b98da823bf4c9d0df.tar.gz kernel_replicant_linux-559f1a2447ccf159fd4c169b98da823bf4c9d0df.tar.bz2 kernel_replicant_linux-559f1a2447ccf159fd4c169b98da823bf4c9d0df.zip |
[armhf] udeb: Fix duplication and circular dependency (really fixes FTBFS)debian/4.3.3-5
There is still duplication between core-modules and usb-modules, and
they actually have a circular dependency due to gpio-viperboard
driving (part of) a USB device.
- Add core-modules as a dependency of usb-modules
- Remove gpio-viperboard from core-modules as it is unlikely to be needed
-rw-r--r-- | debian/changelog | 9 | ||||
-rw-r--r-- | debian/installer/armhf/modules/armhf-armmp/core-modules | 1 | ||||
-rw-r--r-- | debian/installer/package-list | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 72fedfb0f72c..0142459ff100 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +linux (4.3.3-5) unstable; urgency=medium + + * [armhf] udeb: Fix duplication and circular dependency between core-modules + and usb-modules (really fixes FTBFS) + - Add core-modules as a dependency of usb-modules + - Remove gpio-viperboard from core-modules as it is unlikely to be needed + + -- Ben Hutchings <ben@decadent.org.uk> Mon, 04 Jan 2016 00:45:27 +0000 + linux (4.3.3-4) unstable; urgency=medium * [armhf] udeb: Remove pbias-regulator module from mmc-modules as it's now diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules index d2904689da72..7ea5f6dff255 100644 --- a/debian/installer/armhf/modules/armhf-armmp/core-modules +++ b/debian/installer/armhf/modules/armhf-armmp/core-modules @@ -8,7 +8,6 @@ clk-twl6040 ? # GPIO gpio-da9052 ? gpio-pca953x ? -gpio-viperboard ? # PCIe PHYs phy-omap-control ? diff --git a/debian/installer/package-list b/debian/installer/package-list index e79890b7d095..e5590e96fc3c 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -192,7 +192,7 @@ Description: Multipath support This package contains DM-Multipath modules for the kernel. Package: usb-modules -Depends: kernel-image, nls-core-modules +Depends: kernel-image, nls-core-modules, core-modules Priority: extra Description: USB support This package contains core USB drivers for the kernel. |