From patchwork Tue May 22 11:39:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 160615 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 A5545B6F77 for ; Tue, 22 May 2012 21:39:29 +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 1SWnQt-0004Q7-C7; Tue, 22 May 2012 11:39:19 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SWnQj-0004MZ-Qv for kernel-team@lists.ubuntu.com; Tue, 22 May 2012 11:39:09 +0000 Received: from 79-78-211-128.dynamic.dsl.as9105.com ([79.78.211.128] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SWnQj-0006GL-Ko; Tue, 22 May 2012 11:39:09 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: [Config] include include/generated/compile.h Date: Tue, 22 May 2012 12:39:08 +0100 Message-Id: <1337686748-2954-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1337686748-2954-1-git-send-email-apw@canonical.com> References: <1337686748-2954-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft 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 When we prepare the headers all the generated header files are built and installed into the new headers directory, all except for include/generated/compile.h which is actually only made when version.o is built. This header is used and needed by several external modules for their version checks. As we build the headers after we build the main build directory we are able to pull this header out of the binary build directory. All other generated headers are build during the prepare phase. BugLink: http://bugs.launchpad.net/bugs/942569 Signed-off-by: Andy Whitcroft --- debian/rules.d/2-binary-arch.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 4f8fdaf..ad8c812 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -184,6 +184,9 @@ endif # We'll symlink this stuff rm -f $(hdrdir)/Makefile rm -rf $(hdrdir)/include2 + # Copy over the compilation version. + cp "$(builddir)/build-$*/include/generated/compile.h" \ + "$(hdrdir)/include/generated/compile.h" # powerpc seems to need some .o files for external module linking. Add them in. ifeq ($(arch),powerpc) mkdir -p $(hdrdir)/arch/powerpc/lib