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.
This commit is contained in:
Ben Hutchings 2016-02-17 17:55:58 +00:00
parent 96504c2870
commit b0ddcef1a9
3 changed files with 6 additions and 4 deletions

2
debian/changelog vendored
View File

@ -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).

View File

@ -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 -

View File

@ -4,7 +4,7 @@ Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Bastian Blank <waldi@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@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