From patchwork Wed Jun 8 18:43:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 99530 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 7413FB6FDD for ; Thu, 9 Jun 2011 04:43:19 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QUNie-0001nb-5c; Wed, 08 Jun 2011 18:43:08 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QUNib-0001nG-RV for kernel-team@lists.ubuntu.com; Wed, 08 Jun 2011 18:43:05 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QUNib-0002FL-Ou; Wed, 08 Jun 2011 18:43:05 +0000 Received: from 212-139-215-176.dynamic.dsl.as9105.com ([212.139.215.176] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QUNib-0003rN-L9; Wed, 08 Jun 2011 18:43:05 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: custom binaries need VERSION_SIGNATURE updated during prepare Date: Wed, 8 Jun 2011 19:43:03 +0100 Message-Id: <1307558583-32276-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307558583-32276-1-git-send-email-apw@canonical.com> References: <1307558583-32276-1-git-send-email-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 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 BugLink: http://bugs.launchpad.net/bugs/794698 When preparing the custom binary trees we build a configuration. Part of this should involve setting VERSION_SIGNATURE for that build. This is missed for custom binaries which leads to the confusing situation that a -xen flavour will report as below: $ uname -a && cat /proc/version_signature Linux ip-10-36-7-174 2.6.24-29-xen #1 SMP Thu Apr 21 20:44:30 UTC 2011 i686 GNU/Linux Ubuntu 2.6.24-4.6-generic This renders /proc/version_signature worthless. Ensure we fill this in when we build the config. Signed-off-by: Andy Whitcroft Signed-off-by: Stefan Bader Acked-by: Tim Gardner --- debian/rules.d/6-binary-custom.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/debian/rules.d/6-binary-custom.mk b/debian/rules.d/6-binary-custom.mk index ec34480..908d162 100644 --- a/debian/rules.d/6-binary-custom.mk +++ b/debian/rules.d/6-binary-custom.mk @@ -23,7 +23,8 @@ $(stampdir)/stamp-custom-prepare-%: debian/binary-custom.d/%/config.$(arch) \ echo $$patch; \ patch -p1 -d $(origsrc) < $$patch ;\ done - cat $< > $(srcdir)/.config + cat $< | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$*"/' > $(srcdir)/.config + $(kmake) -C $(origsrc) O=$(srcdir) silentoldconfig prepare scripts touch $@