From 863d51a8495e50cfa851ea44035d8be388a2c6e4 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 30 Mar 2005 05:41:28 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/30 00:23:34-05:00 handhelds.org!kergoth Unbork the 'x86' MACHINE: don't build glibc with --with-tls and nptl if you're targeting i386. BKrev: 424a3c08_7JLWkbWSgYEJIdZshRBjA --- conf/machine/x86.conf | 15 +++++++++++++++ packages/glibc/glibc_2.3.3+cvs20041128.bb | 1 - packages/glibc/glibc_2.3.3+cvs20050221.bb | 1 - 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf index e69de29bb2..4c5359e3c4 100644 --- a/conf/machine/x86.conf +++ b/conf/machine/x86.conf @@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: X86 +#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines + +TARGET_ARCH = "i386" +# TARGET_VENDOR = "-oe" +IPKG_ARCHS = "all i386 x86" +PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" + +udevdir = "/dev" +OLDEST_KERNEL = "2.6.5" +# GLIBC_ADDONS = "nptl" +# GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index bd2b7782b0..eac8f27c6f 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -13,7 +13,6 @@ GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_i686 = "0" -DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "0" DEFAULT_PREFERENCE_sh4 = "0" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index da01f34b57..94fe780bee 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -13,7 +13,6 @@ GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_i686 = "0" -DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "0" DEFAULT_PREFERENCE_sh4 = "0" -- cgit v1.2.3