From patchwork Wed Jun  2 01:04:19 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Tim Gardner <tim.gardner@canonical.com>
X-Patchwork-Id: 54337
X-Patchwork-Delegate: leann.ogasawara@canonical.com
Return-Path: <kernel-team-bounces@lists.ubuntu.com>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from chlorine.canonical.com (chlorine.canonical.com
	[91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 535C9B7D48
	for <incoming@patchwork.ozlabs.org>;
	Wed,  2 Jun 2010 11:04:34 +1000 (EST)
Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com)
	by chlorine.canonical.com with esmtp (Exim 4.69)
	(envelope-from <kernel-team-bounces@lists.ubuntu.com>)
	id 1OJcNc-0002xV-3M; Wed, 02 Jun 2010 02:04:24 +0100
Received: from mail.tpi.com ([70.99.223.143])
	by chlorine.canonical.com with esmtp (Exim 4.69)
	(envelope-from <tim.gardner@canonical.com>) id 1OJcNa-0002xO-Fg
	for kernel-team@lists.ubuntu.com; Wed, 02 Jun 2010 02:04:22 +0100
Received: from [IPv6:::1] (mail.tpi.com [70.99.223.143])
	by mail.tpi.com (Postfix) with ESMTP id E6BB6228C58;
	Tue,  1 Jun 2010 18:03:25 -0700 (PDT)
Message-ID: <4C05AE13.2040206@canonical.com>
Date: Tue, 01 Jun 2010 19:04:19 -0600
From: Tim Gardner <tim.gardner@canonical.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.9) Gecko/20100423 Thunderbird/3.0.4
MIME-Version: 1.0
To: Colin Watson <cjwatson@canonical.com>,
	Scott James Remnant <scott.james.remnant@canonical.com>
Subject: Maverick, kernel-wedge
Cc: Kernel team list <kernel-team@lists.ubuntu.com>
X-BeenThere: kernel-team@lists.ubuntu.com
X-Mailman-Version: 2.1.9
Precedence: list
Reply-To: tim.gardner@canonical.com
List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com>
List-Unsubscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>,
	<mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe>
List-Archive: <https://lists.ubuntu.com/archives/kernel-team>
List-Post: <mailto:kernel-team@lists.ubuntu.com>
List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help>
List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>,
	<mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe>
Sender: kernel-team-bounces@lists.ubuntu.com
Errors-To: kernel-team-bounces@lists.ubuntu.com

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

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.