Correct osso-address book dependencies, add oprofile to poky images, switch to htk...

git-svn-id: https://svn.o-hand.com/repos/poky@202 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index 9cabcf3a47e8ada47e6a555423ec3543440ff012..6b2e1e1ed05deef0fdc0c854828d61f4bf177408 100644 (file)
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -124,7 +124,7 @@ PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"
 PREFERRED_VERSION_atk = "1.10.0"
 PREFERRED_VERSION_cairo = "1.0.0"
 PREFERRED_VERSION_glib-2.0 = "2.8.1"
-PREFERRED_VERSION_gtk+ = "2.6.7"
+PREFERRED_VERSION_gtk+ = "2.8.9"
 PREFERRED_VERSION_pango = "1.10.0"
 
 PREFERRED_VERSION_dbus = "0.50"
@@ -157,4 +157,4 @@ PREFERRED_VERSION_xproto ?= "6.6.2"
 PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_xst ?= "0.15"
 
-
+PREFERRED_VERSION_oprofile ?= "0.0cvs${CVSDATE}"

diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb
index e8a9d252d6d141811db35623af08de3544385a8b..482e3135e4208023af66836cdc8f97b5d730946b 100644 (file)
--- a/openembedded/packages/meta/meta-oh.bb
+++ b/openembedded/packages/meta/meta-oh.bb
@@ -37,6 +37,7 @@ oh-task-base = "\
     eds-dbus \
     contacts \
     osso-addressbook \
+    oprofile \
     dates \
     leafpad \
     puzzles \
@@ -64,6 +65,7 @@ RDEPENDS_oh-task-base := "${oh-task-base} \
                          gdk-pixbuf-loader-xpm \
                          gdk-pixbuf-loader-jpeg \
                          gtk-theme-clearlooks \
+                          kernel-module-oprofile \
                           tslib-calibrate \
                           tslib-tests \
                          pango-module-basic-x \

diff --git a/openembedded/packages/oh/osso-addressbook_0.0.bb b/openembedded/packages/oh/osso-addressbook_0.0.bb
index ab49add06a0fde591b97b0687d691d5edbd0d22c..6f627bd2070fe83fff5e28843f3a3d247e903edb 100755 (executable)
--- a/openembedded/packages/oh/osso-addressbook_0.0.bb
+++ b/openembedded/packages/oh/osso-addressbook_0.0.bb
@@ -1,6 +1,7 @@
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libgalago"
-PR = "r0"
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libgalago galago-daemon eds-feed"
+RDEPENDS = "galago-daemon eds-feed"
+PR = "r1"
 
 SRC_URI = "file:///tmp/${PN}-${PV}.tar.gz \
           file://stock_contact.png \