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

[PATCH kernel-wedge 1/3] Set 'join' output format for module dependencies and exclusions



The 'join' command used to print fields in the input order here, as we
wanted, but contrary to documentation.  This has been fixed as of
coreutils 8.13, so we need to set the output format explicitly.
---
This bug is fatal to building any packages with kernel-wedge, as all the
dependencies end up reversed and core modules are duplicated across many
packages.

Ben.

 commands/copy-modules |    2 +-
 debian/changelog      |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/commands/copy-modules b/commands/copy-modules
index f20ac3c..c988827 100755
--- a/commands/copy-modules
+++ b/commands/copy-modules
@@ -170,7 +170,7 @@ for i in $(
 	kernel-wedge preprocess $modlistdir/$i | sort > $tmpdir/module-list/$i
 
 	# exclude modules in exclude from dependency list
-	join -2 2 -v 2 $tmpdir/exclude $tmpdir/deps |
+	join -o 2.1,2.2 -2 2 -v 2 $tmpdir/exclude $tmpdir/deps |
 		sort -k 1,1 > $tmpdir/tmpdeps
 
 	# deal with modules marked as optional and other transformations
diff --git a/debian/changelog b/debian/changelog
index 05b980a..c99837b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kernel-wedge (2.80) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * Set 'join' output format for module dependencies and exclusions,
+    for compatibility with coreutils 8.13
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 25 Sep 2011 21:36:51 +0100
+
 kernel-wedge (2.79) unstable; urgency=low
 
   [ Otavio Salvador ]
-- 
1.7.5.4



Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: