Patchwork Maverick, kernel-wedge

login
register
mail settings
Submitter Tim Gardner
Date June 2, 2010, 1:04 a.m.
Message ID <4C05AE13.2040206@canonical.com>
Download mbox | patch
Permalink /patch/54337/
State Rejected
Delegated to: Leann Ogasawara
Headers show

Comments

Tim Gardner - June 2, 2010, 1:04 a.m.
Colin and Scott,

Please review. This patch makes the maintenance of kernel udebs easier 
by allowing all module definitions to be optional, but I want to make 
sure that en empty udeb won't have an adverse impact elsewhere.

rtg

Patch

diff -Nru kernel-wedge-2.29ubuntu3/commands/check kernel-wedge-2.29ubuntu4/commands/check
--- kernel-wedge-2.29ubuntu3/commands/check	2009-08-07 10:38:09.000000000 -0600
+++ kernel-wedge-2.29ubuntu4/commands/check	2010-06-01 17:52:35.000000000 -0600
@@ -2,10 +2,6 @@ 
 empty=
 for pkg in $(dh_listpackages -s | grep -- '-di$'); do
 	if [ -z  "$(find debian/$pkg -type f)" ]; then
-		echo "$pkg will be empty" >&2
-		empty=1
+		echo "Warning: $pkg will be empty" >&2
 	fi
 done
-if [ "$empty" ]; then
-	exit 1
-fi
diff -Nru kernel-wedge-2.29ubuntu3/debian/changelog kernel-wedge-2.29ubuntu4/debian/changelog
--- kernel-wedge-2.29ubuntu3/debian/changelog	2009-08-10 02:37:21.000000000 -0600
+++ kernel-wedge-2.29ubuntu4/debian/changelog	2010-06-01 18:54:18.000000000 -0600
@@ -1,3 +1,11 @@ 
+kernel-wedge (2.29ubuntu4) maverick; urgency=low
+
+  * commands/check: Don't exit with an error if a udeb package is found
+    to be empty. All of the Maverick kernel udeb module definitions have
+    been changed such that all modules are optional.
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Tue, 01 Jun 2010 23:52:45 +0000
+
 kernel-wedge (2.29ubuntu3) karmic; urgency=low
 
   * In case of error, try to list more failures before bailing out.