From patchwork Tue Feb  2 23:27:40 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Colin Watson <cjwatson@ubuntu.com>
X-Patchwork-Id: 44325
X-Patchwork-Delegate: apw@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 4AEB3B7D5A
	for <incoming@patchwork.ozlabs.org>;
	Wed,  3 Feb 2010 10:27:53 +1100 (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 1NcS9o-0001Mx-Ca; Tue, 02 Feb 2010 23:27:44 +0000
Received: from smarthost02.mail.zen.net.uk ([212.23.3.141])
	by chlorine.canonical.com with esmtp (Exim 4.69)
	(envelope-from <cjwatson@ubuntu.com>) id 1NcS9m-0001Ms-LP
	for kernel-team@lists.ubuntu.com; Tue, 02 Feb 2010 23:27:42 +0000
Received: from [82.69.40.219] (helo=riva.pelham.vpn.ucam.org)
	by smarthost02.mail.zen.net.uk with esmtp (Exim 4.63)
	(envelope-from <cjwatson@ubuntu.com>)
	id 1NcS9m-0003Fy-Cq; Tue, 02 Feb 2010 23:27:42 +0000
Received: from cjwatson by riva.pelham.vpn.ucam.org with local (Exim 3.36 #1
	(Debian)) id 1NcS9k-0006PM-00; Tue, 02 Feb 2010 23:27:40 +0000
Date: Tue, 2 Feb 2010 23:27:40 +0000
From: Colin Watson <cjwatson@ubuntu.com>
To: kernel-team@lists.ubuntu.com
Subject: [PATCH] Future-proof ddeb handling against buildd changes
Message-ID: <20100202232739.GS4409@riva.ucam.org>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Originating-Smarthost02-IP: [82.69.40.219]
Cc: Martin Pitt <martin.pitt@ubuntu.com>
X-BeenThere: kernel-team@lists.ubuntu.com
X-Mailman-Version: 2.1.9
Precedence: list
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

At some point, Launchpad will gain the ability to process ddebs.  When
that happens, we'll add a flag to the /CurrentlyBuilding file on the
buildds.  It'd be nice to ensure in advance that the kernel packaging
can handle this, as pkg_create_dbgsym already does.


Thanks,

diff --git a/debian.master/rules.d/2-binary-arch.mk b/debian.master/rules.d/2-binary-arch.mk
index 4468d25..b927374 100644
--- a/debian.master/rules.d/2-binary-arch.mk
+++ b/debian.master/rules.d/2-binary-arch.mk
@@ -287,8 +287,13 @@ ifneq ($(skipdbg),true)
 	#
 	mv ../$(dbgpkg)_$(release)-$(revision)_$(arch).deb \
 		../$(dbgpkg)_$(release)-$(revision)_$(arch).ddeb
-	grep -v '^$(dbgpkg)_.*$$' debian/files > debian/files.new
-	mv debian/files.new debian/files
+	set -e; \
+	if grep -qs '^Build-Debug-Symbols: yes$$' /CurrentlyBuilding; then \
+		sed -i '/^$(dbgpkg)_/s/\.deb /.ddeb /' debian/files; \
+	else \
+		grep -v '^$(dbgpkg)_.*$$' debian/files > debian/files.new; \
+		mv debian/files.new debian/files; \
+	fi
 	# Now, the package wont get into the archive, but it will get put
 	# into the debug system.
 endif