From fbff0a02fde9dd0b8d4a934972d4311ee5c6877d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 13 Sep 2014 02:30:57 +0000 Subject: [PATCH] udeb: Fix typo in dependencies of speakup-modules We currently FTBFS on mips64el: cannot read /tmp/linux/linux-3.16.2/debian/installer/mips64el/modules/mips64el-sb1-bcm91250a/mips64el-sb1-bcm91250a ... cannot read /tmp/linux/linux-3.16.2/debian/installer/mips64el/modules/mips64el-loongson-3/mips64el-loongson-3 ... find: `debian/speakup-modules-3.16-1-loongson-3-di': No such file or directory speakup-modules-3.16-1-loongson-3-di will be empty The 'cannot read' warnings are due to a bug in kernel-wedge copy-modules (fixed in version 2.90) that affects module list directories that are symlinked. Instead of getting a list of files and symlinks in the directory, it only finds the directory-symlink. The bug was generally harmless because copy-modules also gets a list of inter-package dependencies (without relying on the first list), and this includes all package names. Except that speakup-modules has 'Depends: kernel-image!', and as there is no package definition for 'kernel-image!' this dependency is not included in the second list and copy-modules does not see 'speakup-modules'. mips64el seems to be the only architecture which has a symlink to a module list directory including speakup-modules. Delete the '!'. svn path=/dists/sid/linux/; revision=21834 --- debian/changelog | 2 ++ debian/installer/package-list | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e799c06a5..c66b79a61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,8 @@ linux (3.16.2-3) UNRELEASED; urgency=medium * [armhf] deb-pkg: Add automatic support for armhf architecture * debian/rules.real: Never make kernel-wedge errors non-fatal, as in practice this meant we didn't see them until they appear in unstable + * udeb: Fix typo in dependencies of speakup-modules (fixes FTBFS on + mips64el due to interaction with another bug in kernel-wedge) [ Ian Campbell ] * [armel/orion5x] udeb: Include mvmdio in nic-modules udeb. diff --git a/debian/installer/package-list b/debian/installer/package-list index c5f9db6cb..b54f621b7 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -334,7 +334,7 @@ Description: squashfs modules This package contains squashfs modules. Package: speakup-modules -Depends: kernel-image! +Depends: kernel-image Priority: extra Description: speakup modules This package contains speakup modules.