diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2016-02-17 17:55:58 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-02-17 18:00:31 +0000 |
| commit | b0ddcef1a9d3cbbdc90406da3444af3c8aa0ab11 (patch) | |
| tree | 0f1103a2c7d28efb789d76eaa6e049d97442ff81 | |
| parent | 96504c28700902aa296085e6ccbfa8f18fd22d68 (diff) | |
| download | kernel_replicant_linux-b0ddcef1a9d3cbbdc90406da3444af3c8aa0ab11.tar.gz kernel_replicant_linux-b0ddcef1a9d3cbbdc90406da3444af3c8aa0ab11.tar.bz2 kernel_replicant_linux-b0ddcef1a9d3cbbdc90406da3444af3c8aa0ab11.zip | |
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.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/installer/modules/nic-wireless-modules | 6 | ||||
| -rw-r--r-- | debian/templates/control.source.in | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index c6bf41457d5d..a9491a436824 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 ec7532b71833..104a3a1130d0 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 8f3bd2b8d332..c2d944bf2f5b 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -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 |