diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 29 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 4 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 6 |
3 files changed, 23 insertions, 16 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index ed9127d760..13040fd45d 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -202,7 +202,7 @@ PREFERRED_VERSION_ctrlproxy ?= "2.6.2" PREFERRED_VERSION_cumulus ?= "1.2.1" PREFERRED_VERSION_cups ?= "1.2.12" PREFERRED_VERSION_curl ?= "7.18.2" -PREFERRED_VERSION_curl-native ?= "7.18.0" +PREFERRED_VERSION_curl-native ?= "7.18.2" PREFERRED_VERSION_custominput ?= "1.1.0" PREFERRED_VERSION_cvs ?= "1.12.9" PREFERRED_VERSION_cxcrypt ?= "1.0" @@ -323,7 +323,8 @@ PREFERRED_VERSION_e-uae ?= "0.8.28" PREFERRED_VERSION_eventlog ?= "0.2.5" PREFERRED_VERSION_evieext ?= "1.0.2" PREFERRED_VERSION_evince ?= "2.20.0" -PREFERRED_VERSION_e-wm ?= "0.16.999.041" +# The only e-wm recipe is a cvs one with SRCDATE floating! +# PREFERRED_VERSION_e-wm ?= "0.16.999.042" PREFERRED_VERSION_exiv2 ?= "0.15" PREFERRED_VERSION_exmap-console ?= "0.4.1" PREFERRED_VERSION_exml ?= "cvs" @@ -390,7 +391,7 @@ PREFERRED_VERSION_foonas-init ?= "0.10" PREFERRED_VERSION_foonas-packages ?= "1.0" PREFERRED_VERSION_fortune-mod ?= "1.99.1" PREFERRED_VERSION_fpdf ?= "1.53" -PREFERRED_VERSION_free42-vga ?= "1.4.36" +PREFERRED_VERSION_free42-vga ?= "1.4.41" PREFERRED_VERSION_freeciv ?= "2.0.8" PREFERRED_VERSION_freedoom ?= "0.3" PREFERRED_VERSION_freedroid ?= "1.0.2" @@ -810,7 +811,7 @@ PREFERRED_VERSION_libassa ?= "3.4.2" PREFERRED_VERSION_libassuan ?= "0.6.9" PREFERRED_VERSION_libatomics-ops ?= "1.2" PREFERRED_VERSION_libbedic ?= "1.0" -PREFERRED_VERSION_libbonobo ?= "2.14.0" +PREFERRED_VERSION_libbonobo ?= "2.22.0" PREFERRED_VERSION_libbonoboui ?= "2.18.0" PREFERRED_VERSION_libcache-cache-perl ?= "1.05" PREFERRED_VERSION_libcache-cache-perl-native ?= "1.05" @@ -944,7 +945,7 @@ PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18" PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" PREFERRED_VERSION_libmimedir ?= "0.4.2" PREFERRED_VERSION_libmng ?= "1.0.8" -PREFERRED_VERSION_libmodplug ?= "0.7" +PREFERRED_VERSION_libmodplug ?= "0.8" PREFERRED_VERSION_libmodule-build-perl ?= "0.2805" PREFERRED_VERSION_libmodule-build-perl-native ?= "0.2805" PREFERRED_VERSION_libmrss ?= "0.17.2" @@ -983,8 +984,8 @@ PREFERRED_VERSION_libparams-validate-perl ?= "0.86" PREFERRED_VERSION_libparams-validate-perl-native ?= "0.86" PREFERRED_VERSION_libpcap ?= "0.9.8" PREFERRED_VERSION_libpcl ?= "1.4" -PREFERRED_VERSION_libpcre ?= "4.4" -PREFERRED_VERSION_libpcre-native ?= "4.4" +PREFERRED_VERSION_libpcre ?= "7.6" +PREFERRED_VERSION_libpcre-native ?= "7.6" PREFERRED_VERSION_libperl6-junction-perl ?= "1.10" PREFERRED_VERSION_libpng ?= "1.2.20" PREFERRED_VERSION_libpng-native ?= "1.2.20" @@ -1056,7 +1057,7 @@ PREFERRED_VERSION_libversion-perl ?= "0.6701" PREFERRED_VERSION_libversion-perl-native ?= "0.6701" PREFERRED_VERSION_libvisual ?= "0.1.3" PREFERRED_VERSION_libvisual-plugins ?= "0.1.3" -PREFERRED_VERSION_libvncserver ?= "0.8.2" +PREFERRED_VERSION_libvncserver ?= "0.9" PREFERRED_VERSION_libvocenabler ?= "0.1" PREFERRED_VERSION_libvorbis ?= "1.0.1" PREFERRED_VERSION_libw100 ?= "0.0.2" @@ -1107,7 +1108,7 @@ PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" PREFERRED_VERSION_libxsettings ?= "0.11" PREFERRED_VERSION_libxsettings-client ?= "0.17" PREFERRED_VERSION_libxslt ?= "1.1.22" -PREFERRED_VERSION_libxslt-native ?= "1.1.22" +PREFERRED_VERSION_libxslt-native ?= "1.1.21" PREFERRED_VERSION_libxt ?= "1.0.5" PREFERRED_VERSION_libxtrap ?= "1.0.0" PREFERRED_VERSION_libxtst ?= "1.0.3" @@ -1312,7 +1313,7 @@ PREFERRED_VERSION_nano ?= "2.0.7" PREFERRED_VERSION_nasm-native ?= "0.98.38" PREFERRED_VERSION_nautilus ?= "2.12.2" PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5" -PREFERRED_VERSION_navit ?= "0.0.3" +PREFERRED_VERSION_navit ?= "0.0.4" PREFERRED_VERSION_nbd ?= "2.8.7" PREFERRED_VERSION_ncftp ?= "3.2.0" PREFERRED_VERSION_ncmpc ?= "0.11.1" @@ -1454,7 +1455,7 @@ PREFERRED_VERSION_pmtools ?= "20050926" PREFERRED_VERSION_poboxserver ?= "1.2.5" PREFERRED_VERSION_pocketcellar ?= "1.1" PREFERRED_VERSION_pocketsphinx ?= "0.2.1" -PREFERRED_VERSION_poppler ?= "0.6" +PREFERRED_VERSION_poppler ?= "0.8.4" PREFERRED_VERSION_poppler-data ?= "0.1" PREFERRED_VERSION_popt ?= "1.7" PREFERRED_VERSION_popt-native ?= "1.7" @@ -1538,7 +1539,7 @@ PREFERRED_VERSION_python-pycurl ?= "7.18.2" PREFERRED_VERSION_python-pyephem ?= "3.7.2a" PREFERRED_VERSION_python-pyfits ?= "1.1" PREFERRED_VERSION_python-pyflakes ?= "0.2.1" -PREFERRED_VERSION_python-pygame ?= "1.7.1" +PREFERRED_VERSION_python-pygame ?= "1.8.1" PREFERRED_VERSION_python-pygnome ?= "2.16.2" PREFERRED_VERSION_python-pygobject ?= "2.14.2" PREFERRED_VERSION_python-pygobject-native ?= "2.14.2" @@ -1892,7 +1893,7 @@ PREFERRED_VERSION_ubahnnav ?= "0.4.1" PREFERRED_VERSION_u-boot ?= "1.2.0" PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4" PREFERRED_VERSION_u-boot-utils ?= "1.2.0" -PREFERRED_VERSION_udev ?= "115" +PREFERRED_VERSION_udev ?= "092" PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0" PREFERRED_VERSION_udhcp ?= "0.9.8" PREFERRED_VERSION_ufraw ?= "0.12" @@ -1984,7 +1985,7 @@ PREFERRED_VERSION_wview-vpro ?= "3.1.3" PREFERRED_VERSION_wview-vpro-mysql ?= "3.1.3" PREFERRED_VERSION_wview-wxt510 ?= "3.1.3" PREFERRED_VERSION_wview-wxt510-mysql ?= "3.1.3" -PREFERRED_VERSION_wxwidgets ?= "2.6.3" +PREFERRED_VERSION_wxwidgets ?= "2.8.7" PREFERRED_VERSION_x11perf ?= "1.4.1" PREFERRED_VERSION_x11vnc ?= "0.9.3" PREFERRED_VERSION_xaos ?= "3.2.3" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 958b141c71..fd6d5612a2 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -15,8 +15,8 @@ SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6" SRCREV_pn-assassin ?= "93" SRCREV_pn-bfin-uclibc ?= "1857" -SRCREV_pn-uclibc ?= "21996" -SRCREV_pn-uclibc-initial ?= "21996" +SRCREV_pn-uclibc ?= "23129" +SRCREV_pn-uclibc-initial ?= "23129" SRCREV_pn-contact ?= "1410" SRCREV_pn-dasher-gpe ?= "1251" SRCREV_pn-dbus-c++-native ?= "13131" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 320d9c057b..d36a6188df 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -65,6 +65,12 @@ PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" PREFERRED_PROVIDER_midpath = "midpath-openmoko" +# We don't use this, but select one to shut bitbake up. +PREFERRED_PROVIDER_virtual/libqte2 = "qte" + +# opkg +PREFERRED_PROVIDER_opkg = "opkg" + # deploy gta01 and gta02 in ${MACHINE_CLASS} directory DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" DEPLOY_DIR_IMAGE_om-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" |