[PATCH 2/2 Trusty SRU V2] UBUNTU: [Config] Treat vdso install as an environment variable

Tim Gardner tim.gardner at canonical.com
Tue Jun 3 15:45:09 UTC 2014


Disabled on armhf as it FTBSs.

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 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
 
-- 
1.9.1





More information about the kernel-team mailing list