From patchwork Tue Jun 17 15:56:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 360560 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id E8589140086; Wed, 18 Jun 2014 01:56:18 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Wwvk6-0006UT-S8; Tue, 17 Jun 2014 15:56:14 +0000 Received: from mail.tpi.com ([74.45.170.26]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Wwvk0-0006UN-3q for kernel-team@lists.ubuntu.com; Tue, 17 Jun 2014 15:56:08 +0000 Received: from [10.0.2.8] (host-174-45-39-7.hln-mt.client.bresnan.net [174.45.39.7]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id 81DF73592CE for ; Tue, 17 Jun 2014 08:56:28 -0700 (PDT) Message-ID: <53A06516.7080902@canonical.com> Date: Tue, 17 Jun 2014 09:56:06 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: kernel-team@lists.ubuntu.com Subject: APPLIED: [PATCH Trusty SRU V3] UBUNTU: [Debian] Add UTS_UBUNTU_RELEASE_ABI to utsrelease.h References: <53A03ACC.6060808@canonical.com> <1403018847-16247-1-git-send-email-tim.gardner@canonical.com> <1403018847-16247-2-git-send-email-tim.gardner@canonical.com> In-Reply-To: <1403018847-16247-2-git-send-email-tim.gardner@canonical.com> X-Enigmail-Version: 1.5.2 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com After some bike shedding, see final attached patch. From 7286c5782cf108b1310fa085f031de35a82279b8 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Mon, 16 Jun 2014 14:52:15 -0600 Subject: [PATCH] UBUNTU: [Debian] Add UTS_UBUNTU_RELEASE_ABI to utsrelease.h BugLink: http://bugs.launchpad.net/bugs/1327619 Provides for finer grained kernel identification for external modules. Signed-off-by: Tim Gardner Acked-by: Brad Figg Acked-by: Stefan Bader --- debian/rules.d/2-binary-arch.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 98fdf89..4b43d2f 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -244,6 +244,8 @@ endif # Copy over the compilation version. cp "$(builddir)/build-$*/include/generated/compile.h" \ "$(hdrdir)/include/generated/compile.h" + # Add UTS_UBUNTU_RELEASE_ABI since UTS_RELEASE is difficult to parse. + echo "#define UTS_UBUNTU_RELEASE_ABI $(abinum)" >> $(hdrdir)/include/generated/utsrelease.h # powerpc kernel arch seems to need some .o files for external module linking. Add them in. ifeq ($(build_arch),powerpc) mkdir -p $(hdrdir)/arch/powerpc/lib -- 1.9.1