diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-24 17:30:28 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-24 17:30:28 +0100 |
| commit | d14a90c12878fbe3edfe32266ca94304938a5f1c (patch) | |
| tree | 3ee67240032c85dd367bdb7d61f1fccea439ec56 /conf | |
| parent | 08f02468d5a3963cf0114285835f46cf0249b944 (diff) | |
| parent | d60324b13d73bcaecbbf06be57e902bb938210d8 (diff) | |
Merge branch 'org.openembedded.dev' of ssh://git@git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 1 | ||||
| -rw-r--r-- | conf/machine/wrap.conf | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index b19794038c..a11c1d5691 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -13,7 +13,6 @@ PREFERRED_VERSION_gtk+ = "2.16.0" PREFERRED_VERSION_gtkmm = "2.14.1" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" -PREFERRED_VERSION_libosip2 = "2.2.2" PREFERRED_VERSION_libsdl-x11 = "1.2.11" PREFERRED_VERSION_libtool = "2.2.4" PREFERRED_VERSION_libtool-native = "2.2.4" diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf index 1fc75ebe94..8dbd6619d9 100644 --- a/conf/machine/wrap.conf +++ b/conf/machine/wrap.conf @@ -3,7 +3,8 @@ #@DESCRIPTION: Machine configuration for the PC Engines WRAP (Wireless Router Application Platform) boards. TARGET_ARCH = "i486" -PACKAGE_EXTRA_ARCHS = "i386 x86" + +require conf/machine/include/tune-x86.inc PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" |