diff mbox

APPLIED: [PATCH Trusty SRU V3] UBUNTU: [Debian] Add UTS_UBUNTU_RELEASE_ABI to utsrelease.h

Message ID 53A06516.7080902@canonical.com
State New
Headers show

Commit Message

Tim Gardner June 17, 2014, 3:56 p.m. UTC 
After some bike shedding, see final attached patch.
diff mbox

Patch

From 7286c5782cf108b1310fa085f031de35a82279b8 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
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 <tim.gardner@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
---
 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