From patchwork Tue Jun 3 15:45:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 355577 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 A46BA14009E; Wed, 4 Jun 2014 01:45:41 +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 1Wrqu7-0002hG-P5; Tue, 03 Jun 2014 15:45:35 +0000 Received: from mail.tpi.com ([74.45.170.26]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Wrqu0-0002gq-9B for kernel-team@lists.ubuntu.com; Tue, 03 Jun 2014 15:45:28 +0000 Received: from salmon.rtg.net (mail.tpi.com [10.0.0.205]) by mail.tpi.com (Postfix) with ESMTP id 756023585D4; Tue, 3 Jun 2014 08:45:44 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id 4EC4B203EF; Tue, 3 Jun 2014 09:45:27 -0600 (MDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2 Trusty SRU V2] UBUNTU: [Config] Treat vdso install as an environment variable Date: Tue, 3 Jun 2014 09:45:09 -0600 Message-Id: <1401810309-5980-2-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1401810309-5980-1-git-send-email-tim.gardner@canonical.com> References: <538D2DDC.3040504@canonical.com> <1401810309-5980-1-git-send-email-tim.gardner@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Disabled on armhf as it FTBSs. Signed-off-by: Tim Gardner --- debian.master/rules.d/amd64.mk | 1 + debian.master/rules.d/arm64.mk | 1 + debian.master/rules.d/i386.mk | 1 + debian.master/rules.d/powerpc.mk | 1 + debian.master/rules.d/ppc64el.mk | 1 + debian.master/rules.d/x32.mk | 1 + 6 files changed, 6 insertions(+) diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 743a031..860962a 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -7,6 +7,7 @@ build_image = bzImage kernel_file = arch/$(build_arch)/boot/bzImage install_file = vmlinuz loader = grub +vdso = vdso_install no_dumpfile = true uefi_signed = true do_tools_cpupower = true diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index 1690a1d..5742f80 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -9,6 +9,7 @@ install_file = vmlinuz no_dumpfile = true loader = grub +vdso = vdso_install do_tools_cpupower = true do_tools_perf = true diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk index 3243b7c..b95d425 100644 --- a/debian.master/rules.d/i386.mk +++ b/debian.master/rules.d/i386.mk @@ -7,6 +7,7 @@ build_image = bzImage kernel_file = arch/$(build_arch)/boot/bzImage install_file = vmlinuz loader = grub +vdso = vdso_install no_dumpfile = true do_tools_cpupower = true do_tools_perf = true diff --git a/debian.master/rules.d/powerpc.mk b/debian.master/rules.d/powerpc.mk index ca55d74..e188925 100644 --- a/debian.master/rules.d/powerpc.mk +++ b/debian.master/rules.d/powerpc.mk @@ -19,6 +19,7 @@ build_image_powerpc-e500 = uImage kernel_file_powerpc-e500 = arch/powerpc/boot/uImage loader = yaboot +vdso = vdso_install custom_flavours = diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk index 94ffba6..c484946 100644 --- a/debian.master/rules.d/ppc64el.mk +++ b/debian.master/rules.d/ppc64el.mk @@ -8,6 +8,7 @@ kernel_file = arch/powerpc/boot/vmlinux.strip install_file = vmlinux no_dumpfile = true loader = grub +vdso = vdso_install do_extras_package = true do_tools_cpupower = true diff --git a/debian.master/rules.d/x32.mk b/debian.master/rules.d/x32.mk index 41bc321..94d4c83 100644 --- a/debian.master/rules.d/x32.mk +++ b/debian.master/rules.d/x32.mk @@ -7,6 +7,7 @@ build_image = bzImage kernel_file = arch/$(build_arch)/boot/bzImage install_file = vmlinuz loader = grub +vdso = vdso_install no_dumpfile = true uefi_signed = true