[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 1/3] gen-deps: Ignore default dependencies that are overridden per-architecture



Ignore dependencies in default package-list that are overridden by the
architecture package-list, consistent with gen-control (Closes: #678587)

The previous behaviour masked incomplete dependency lists for some of
the Linux udebs.
---
The incomplete dependencies were fixed in linux 3.2.21-2, so this
should have no immediate effect on Linux.  However it is possible that
kFreeBSD has the same problem and would fail to build after this.

Ben.

 commands/gen-deps |    4 ++++
 debian/changelog  |    7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/commands/gen-deps b/commands/gen-deps
index c637375..f596c4c 100755
--- a/commands/gen-deps
+++ b/commands/gen-deps
@@ -39,6 +39,10 @@ sub read_package_list
 				$modlistdir = "$configdir/modules/$arch";
 			}
 			next unless -e "$modlistdir/$package";
+
+			# Override previously defined dependencies
+			@out = grep(!/^$package\t/, @out);
+
 			foreach my $dep (@depends) {
 				# Skip depends that are not built for this
 				# architecture.
diff --git a/debian/changelog b/debian/changelog
index fece32d..6bebe43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kernel-wedge (2.85) UNRELEASED; urgency=low
+
+  * gen-deps: Ignore dependencies in default package-list that are
+    overridden by the architecture package-list (Closes: #678587)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 24 Jun 2012 19:34:25 +0100
+
 kernel-wedge (2.84) unstable; urgency=low
 
   [ Joey Hess ]

Attachment: signature.asc
Description: Digital signature


Reply to: