diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-08-25 17:00:30 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-08-25 17:00:30 +0000 |
| commit | 3cdc3b52b167778be7f2c45b1a885f0af7864f97 (patch) | |
| tree | b0e6176e9c836a3cae4f1f835e51156e9e114184 /conf/distro/include | |
| parent | afba23ee6fd6c6c0262b0b46cace12a9087f3670 (diff) | |
| parent | 3ea8eeaef5fced41a090c1230642d51db358a544 (diff) | |
merge of '7222928a192dd87d681067dcc74025c3a2ecf986'
and 'c9235531d0eda1ab2165b6651685887b61d57ba1'
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/angstrom-eglibc.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-glibc.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/openmoko.inc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index dc3929c3a7..91afb658e3 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -2,6 +2,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 1eabe6b868..1502833389 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -2,7 +2,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 7c3c4a8f41..80c861b95c 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -119,7 +119,7 @@ PREFERRED_VERSION_dates = "0.1" # Development # PREFERRED_PROVIDER_qemu-native = "qemu-native" -PREFERRED_VERSION_qemu-native = "0.8.2+cvs${SRCDATE}" +PREFERRED_VERSION_qemu-native = "0.9.0+cvs${SRCDATE}" # # Opie |