summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/angstrom-uclibc.inc2
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc6
-rw-r--r--conf/distro/include/sane-srcrevs.inc4
-rw-r--r--conf/machine/netvista.conf4
4 files changed, 9 insertions, 7 deletions
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index cc2c3b100d..4b68293faf 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -14,7 +14,7 @@ USE_NLS ?= "no"
USE_NLS_glib-2.0 = "yes"
TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
-TARGET_OS ?= "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}"
+TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}"
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index a03f42fe0d..62fbfec9ff 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1555,8 +1555,8 @@ PREFERRED_VERSION_python-pymp3 ?= "0.3.4"
PREFERRED_VERSION_python-pyrad ?= "0.8"
PREFERRED_VERSION_python-pyraf ?= "1.4"
PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
-PREFERRED_VERSION_python-pyrex ?= "0.9.8"
-PREFERRED_VERSION_python-pyrex-native ?= "0.9.8"
+PREFERRED_VERSION_python-pyrex ?= "0.9.8.4"
+PREFERRED_VERSION_python-pyrex-native ?= "0.9.8.4"
PREFERRED_VERSION_python-pyro ?= "3.7"
PREFERRED_VERSION_python-pyserial ?= "2.2"
PREFERRED_VERSION_python-pytester ?= "0.6.0"
@@ -1764,7 +1764,7 @@ PREFERRED_VERSION_sox-native ?= "13.0.0"
PREFERRED_VERSION_spandsp ?= "0.0.3"
PREFERRED_VERSION_spca5xx ?= "20060501"
PREFERRED_VERSION_spectrum-fw ?= "1.0"
-PREFERRED_VERSION_speex ?= "1.1.12"
+PREFERRED_VERSION_speex ?= "1.1+1.2rc1"
PREFERRED_VERSION_sphinxbase ?= "0.1"
PREFERRED_VERSION_squashfs-lzma-tools ?= "3.1r2"
PREFERRED_VERSION_squashfs-lzma-tools-native ?= "3.1r2"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 4490907774..3840346eb9 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -26,8 +26,8 @@ SRCREV_pn-dfu-util-native ?= "4160"
SRCREV_pn-diversity-daemon ?= "277"
SRCREV_pn-diversity-nav ?= "340"
SRCREV_pn-eds-dbus ?= "659"
-SRCREV_pn-eglibc ?= "6229"
-SRCREV_pn-eglibc-initial ?= "6229"
+SRCREV_pn-eglibc ?= "6625"
+SRCREV_pn-eglibc-initial ?= "6625"
SRCREV_pn-enlazar ?= "37"
SRCREV_pn-exalt ?= "79"
SRCREV_pn-exalt-daemon ?= "78"
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index f95e403367..65ad872ba6 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -7,7 +7,7 @@ PACKAGE_EXTRA_ARCHS = "netvista"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_VERSION_linux = "2.6.23"
-XSERVER = "xserver-kdrive-vesa"
+XSERVER = "xserver-kdrive-fbdev"
KERNEL_IMAGETYPE = "bzImage"
@@ -23,3 +23,5 @@ udevdir = "/dev"
OLDEST_KERNEL = "2.6.17"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
+
+require conf/machine/include/tune-x86.inc