[linux] 01/01: [armhf] udeb: Fix duplication and circular dependency (really fixes FTBFS)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 559f1a2447ccf159fd4c169b98da823bf4c9d0df
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Jan 4 00:46:39 2016 +0000

    [armhf] udeb: Fix duplication and circular dependency (really fixes FTBFS)
    
    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
---
 debian/changelog                                        | 9 +++++++++
 debian/installer/armhf/modules/armhf-armmp/core-modules | 1 -
 debian/installer/package-list                           | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72fedfb..0142459 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 at 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 d290468..7ea5f6d 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 e79890b..e5590e9 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git