]> git.openpandora.org Git - openembedded.git/commitdiff
Merge bk://oe-devel.bkbits.net/openembedded
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Wed, 30 Mar 2005 05:41:28 +0000 (05:41 +0000)
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Wed, 30 Mar 2005 05:41:28 +0000 (05:41 +0000)
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
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb

index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4c5359e3c40aeb85b6145d7a012f7a5b0ec41c7c 100644 (file)
@@ -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"
index bd2b7782b00872162e58961c39f28e93a1839c49..eac8f27c6ff1fae0115bdfc2aeb1188b22380624 100644 (file)
@@ -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"
 
index da01f34b57035549d69f10c41160b7dd9ea1ac32..94fe780beec88768e1c4d57db915a4d55a36fc03 100644 (file)
@@ -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"