summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/include/moko-autorev.inc5
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc3
-rw-r--r--conf/distro/include/sane-srcrevs.inc4
-rw-r--r--conf/distro/openmoko.conf7
4 files changed, 17 insertions, 2 deletions
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index c5390811c6..aa2d39f3db 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -9,6 +9,10 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
SRCREV_pn-neod ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
+
+SRCREV_pn-multitap-pad ?= "${AUTOREV}"
SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
@@ -30,6 +34,7 @@ SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-memory ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 7b92333189..10af8675e8 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1,6 +1,9 @@
+PREFERRED_VERSION_asterisk = "1.4.17"
PREFERRED_VERSION_busybox = "1.9.1"
PREFERRED_VERSION_dbus = "1.1.20"
PREFERRED_VERSION_dbus-glib = "0.74"
+PREFERRED_VERSION_gnash = "0.8.1"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.24"
PREFERRED_VERSION_pulseaudio = "0.9.9"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 28f9b3dc20..652c5ba542 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -64,6 +64,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-moko-gtk-engine ?= "3405"
SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-mplayer ?= "24587"
+SRCREV_pn-multitap-pad ?= "337"
SRCREV_pn-neod ?= "3421"
SRCREV_pn-netsurf ?= "3859"
SRCREV_pn-networkmanager ?= "2887"
@@ -107,6 +108,7 @@ SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
SRCREV_pn-openmoko-panel-gps ?= "2900"
SRCREV_pn-openmoko-panel-gsm ?= "3664"
SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
+SRCREV_pn-openmoko-panel-memory ?= "3903"
SRCREV_pn-openmoko-panel-usb ?= "3360"
SRCREV_pn-openmoko-sample2 ?= "3528"
SRCREV_pn-openmoko-session ?= "152"
@@ -134,7 +136,7 @@ SRCREV_pn-opkg ?= "4022"
SRCREV_pn-opkg-native ?= "4019"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pyneod ?= "85"
+SRCREV_pn-pyneod ?= "86"
SRCREV_pn-pyneog ?= "85"
SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "127"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 55237c89b8..8fab5e5058 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -14,6 +14,7 @@ DISTRO_NAME = "OpenMoko"
DISTRO_VERSION = "P1-Snapshot-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
+DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat"
OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
@@ -63,7 +64,11 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
+# for jalimo
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
+
# deploy gta01 and gta02 in ${MACHINE_CLASS} directory
DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-