[linux] 02/02: udeb: Fix issues with wildcards that caused FTBFS on armhf, thanks to Karsten Merker

[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 b0ddcef1a9d3cbbdc90406da3444af3c8aa0ab11
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Feb 17 17:55:58 2016 +0000

    udeb: Fix issues with wildcards that caused FTBFS on armhf, thanks to Karsten Merker
    
    Karsten did a test-build on armhf and found failures due to missing modules
    and directories.
    
    * The wireless drivers from staging need to be optional; this requires
      support for wildcards in optional-inclusion lines
    * The check for a containing directory must only be done for non-optional
      inclusion lines
    
    Bump the kernel-wedge version requirement and add the optional-include
    suffixes.
---
 debian/changelog                              | 2 ++
 debian/installer/modules/nic-wireless-modules | 6 +++---
 debian/templates/control.source.in            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6bf414..a9491a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ linux (4.4.1-1) UNRELEASED; urgency=medium
       translations
     - [i386/686-pae] PCI: Set pci=nobios by default
   * IFF_NO_QUEUE: Fix for drivers not calling ether_setup() (regression in 4.3)
+  * udeb: Fix issues with wildcards that caused FTBFS on armhf, thanks to
+    Karsten Merker
 
   [ Roger Shimizu ]
   * Enable TTY_PRINTK as module (Closes: #814540).
diff --git a/debian/installer/modules/nic-wireless-modules b/debian/installer/modules/nic-wireless-modules
index ec7532b..104a3a1 100644
--- a/debian/installer/modules/nic-wireless-modules
+++ b/debian/installer/modules/nic-wireless-modules
@@ -2,9 +2,9 @@
 drivers/net/wireless/**
 
 # Include staging wireless drivers
-prism2_usb
-drivers/staging/rtl8**
-vt6656_stage
+prism2_usb ?
+drivers/staging/rtl8** ?
+vt6656_stage ?
 
 # Exclude drivers packaged in nic-pcmcia-modules
 drivers/net/wireless/**_cs -
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 8f3bd2b..c2d944b 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -4,7 +4,7 @@ Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
 Standards-Version: 3.9.5
 Build-Depends: debhelper, python3:any, quilt,
- cpio <!stage1>, kmod <!stage1>, xz-utils <!stage1>, kernel-wedge (>= 2.92~) <!stage1>, bc <!stage1>
+ cpio <!stage1>, kmod <!stage1>, xz-utils <!stage1>, kernel-wedge (>= 2.93~) <!stage1>, bc <!stage1>
 Build-Depends-Indep: patchutils <!stage1>, xmlto <!stage1>
 Vcs-Git: https://anonscm.debian.org/git/kernel/linux.git
 Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux.git

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