Update and lock OHM down to a working revision, also remove some crack

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

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 0d24b9c2b01140f755262bc45694af14527eca71..374f1b257b5fcc06685412c72e3844a57132764f 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -110,6 +110,7 @@ SRCREV_pn-libowl ?= "277"
 SRCDATE_libxcalibrate ?= "20070607"
 SRCDATE_calibrateproto ?= "20070607"
 SRCDATE_hal-info ?= "20070727"
+SRCREV_ohm ?= "437a86a4b18a2be033225432fd099bcb7f0c3114"
 SRCDATE_gtk-theme-torturer ?= "20070529"
 SRCREV_pn-libsyncml ?= "241"
 SRCREV_pn-matchbox-applet-light ?= "1548"

diff --git a/meta/packages/ohm/ohm_git.bb b/meta/packages/ohm/ohm_git.bb
index ae338bf2da58cafbe12604547f75400c264c3579..9cdea709cf8c81a91018ca28c82767ee06f5f236 100644 (file)
--- a/meta/packages/ohm/ohm_git.bb
+++ b/meta/packages/ohm/ohm_git.bb
@@ -7,20 +7,19 @@ RDEPENDS_${PN} += "udev hal-info"
 SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git"
 
 PV = "0.0+git${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-distro=debian --disable-gtk-doc --with-xauth-dir=/home/root"
+EXTRA_OECONF = "--with-distro=debian \
+        --with-xauth-dir=/home/root \
+        --disable-gtk-doc \
+        --disable-docbook-docs"
 
 do_configure_prepend() {
-       touch gtk-doc.make
-}
-
-do_configure_append() {
-        rm config.log
+        touch gtk-doc.make
 }
 
 OE_LT_RPATH_ALLOW=":${libdir}/libohm:"
@@ -28,20 +27,17 @@ OE_LT_RPATH_ALLOW[export]="1"
 
 PACKAGES =+ "libohm ohm-plugin-x11"
 
-FILES_${PN}-dev += "${libdir}/ohm/*.la \
-                   ${libdir}/ohm/*.a "
+FILES_${PN}-dev += "${libdir}/ohm/*.a"
 
 FILES_${PN} = "${sysconfdir} \
                ${bindir}/* \
-              ${sbindir}/* \
-              ${libdir}/ohm/*.so \
-              "
+               ${sbindir}/* \
+               ${libdir}/ohm/*.so \
+               "
 
 FILES_libohm = "${libdir}/libohm.so.*"
 FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \
                         ${libdir}/ohm/libohm_idle.so \ 
                         ${sysconfdir}/ohm/plugins.d/x* \
-                       ${sysconfdir}/ohm/plugins.d/idle* \
-                       "
-
-
+                        ${sysconfdir}/ohm/plugins.d/idle* \
+                        "