From patchwork Mon Sep 13 18:45:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 64625 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: 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 22E82B70A7 for ; Tue, 14 Sep 2010 04:45:41 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OvE23-00032A-0q; Mon, 13 Sep 2010 19:45:35 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OvE1z-00031c-M5 for kernel-team@lists.ubuntu.com; Mon, 13 Sep 2010 19:45:31 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OvE1z-0002I3-Ki for ; Mon, 13 Sep 2010 19:45:31 +0100 Received: from 212-139-221-210.dynamic.dsl.as9105.com ([212.139.221.210] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OvE1z-00054V-F7 for kernel-team@lists.ubuntu.com; Mon, 13 Sep 2010 19:45:31 +0100 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: bodge linux-libc-dev package version due to ti-omap4 error Date: Mon, 13 Sep 2010 19:45:28 +0100 Message-Id: <1284403529-6286-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1284403529-6286-1-git-send-email-apw@canonical.com> References: <1284403529-6286-1-git-send-email-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The ti-omap4 2.6.35-803.8 upload inadvertantly emitted a linux-libc-dev at this version. This is far in the future compared to the master branch leading to binary upload failures for armel when uploading master. Add a 2.6.35 and master branch specific bodge to bump the ABI number up by 1000 just for the linux-libc-dev package. Signed-off-by: Andy Whitcroft --- debian/rules.d/0-common-vars.mk | 12 ++++++++++++ debian/rules.d/1-maintainer.mk | 1 + debian/rules.d/2-binary-arch.mk | 2 +- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 2880576..e03fa14 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -79,6 +79,18 @@ ifneq ($(full_build),false) uploadnum := $(uploadnum)-Ubuntu endif +# XXX: linux-libc-dev got bumped to -803.N inadvertantly by a ti-omap4 upload +# shift our version higher for this package only. Ensure this only +# occurs for the v2.6.35 kernel so that we do not propogate this into +# any other series. +raw_uploadnum := $(shell echo $(revision) | sed -e 's/.*\.//') +libc_dev_version := +ifeq ($(DEBIAN),debian.master) +ifeq ($(release),2.6.35) +libc_dev_version := -v$(release)-$(shell expr "$(abinum)" + 1000).$(raw_uploadnum) +endif +endif + # We force the sublevel to be exactly what we want. The actual source may # be an in development git tree. We want to force it here instead of # committing changes to the top level Makefile diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 4443274..7ad68dd 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -108,6 +108,7 @@ endif @echo "do_full_source = $(do_full_source)" @echo "do_tools = $(do_tools)" @echo "full_build = $(full_build)" + @echo "libc_dev_version = $(libc_dev_version)" printchanges: @baseCommit=$$(git log --pretty=format:'%H %s' | \ diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 16656c0..e4a4f3c 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -255,7 +255,7 @@ ifeq ($(do_libc_dev_package),true) dh_compress -plinux-libc-dev dh_fixperms -plinux-libc-dev dh_installdeb -plinux-libc-dev - dh_gencontrol -plinux-libc-dev + dh_gencontrol -plinux-libc-dev -- $(libc_dev_version) dh_md5sums -plinux-libc-dev dh_builddeb -plinux-libc-dev endif