diff options
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 11 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 3 | ||||
| -rw-r--r-- | packages/python/python-pygame_1.8.1.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko-feed.bb | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index ed9127d760..25ca605961 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" @@ -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" @@ -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" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 320d9c057b..6b2531b381 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -65,6 +65,9 @@ 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" + # 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}" diff --git a/packages/python/python-pygame_1.8.1.bb b/packages/python/python-pygame_1.8.1.bb index 2debc950ea..dc3f431964 100644 --- a/packages/python/python-pygame_1.8.1.bb +++ b/packages/python/python-pygame_1.8.1.bb @@ -8,7 +8,7 @@ SRCNAME = "pygame" PR = "ml0" SRC_URI = "\ - ftp://ftp.pyganem.org/pygame/${SRCNAME}-${PV}release.tar.gz \ + ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \ file://Setup" S = "${WORKDIR}/${SRCNAME}-${PV}release" diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index b68bb7ee6c..ecf2002473 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r33" +PR = "r34" inherit task @@ -89,4 +89,6 @@ RDEPENDS_task-openmoko-feed = "\ # subversion \ task-openmoko-games \ xournal \ + openvpn \ + python-pygame \ " |