From 5cf953b02ea6d103b7c09d6f36c198d550d06367 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 6 Sep 2012 15:23:40 -0700 Subject: machines/x86: Drop redundant glibc configure knobs nptl and thereby tls are not optional anymore (From OE-Core rev: 1a4b277e47a8d624cde4c73713d036e230f3a523) Signed-off-by: Khem Raj Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/conf/machine/include/ia32-base.inc | 5 ----- meta/conf/machine/qemux86-64.conf | 3 --- meta/conf/machine/qemux86.conf | 4 ---- 3 files changed, 12 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc index af583ae184..78d4458066 100644 --- a/meta/conf/machine/include/ia32-base.inc +++ b/meta/conf/machine/include/ia32-base.inc @@ -17,11 +17,6 @@ KERNEL_IMAGETYPE ?= "bzImage" SERIAL_CONSOLE ?= "115200 ttyS0" -# -# glibc-related variables -# -GLIBC_ADDONS ?= "nptl" - # # kernel-related variables # diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 285054ab3d..8d4bd6f487 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -26,7 +26,4 @@ require conf/machine/include/qemu.inc MACHINE_FEATURES += "x86" -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index c81afe5657..6edf386d0e 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -26,8 +26,4 @@ require conf/machine/include/qemu.inc MACHINE_FEATURES += "x86" -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" - -- cgit v1.2.3-54-g00ecf