aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-19 15:15:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-20 14:27:41 +0100
commit5caa2b521ed82cc1a223eddc59450ce68bbb3962 (patch)
treed0eedcf71992a409ede061890bb914a44cd34f1f /meta
parent69bae4de251da32e26eae5a57d7dccc904db17da (diff)
downloadopenembedded-core-5caa2b521ed82cc1a223eddc59450ce68bbb3962.tar.gz
openembedded-core-5caa2b521ed82cc1a223eddc59450ce68bbb3962.tar.bz2
openembedded-core-5caa2b521ed82cc1a223eddc59450ce68bbb3962.zip
gypsy: inherit gtk-doc
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/gypsy/gypsy.inc6
-rw-r--r--meta/recipes-connectivity/gypsy/gypsy_0.8.bb2
-rw-r--r--meta/recipes-connectivity/gypsy/gypsy_git.bb2
3 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc b/meta/recipes-connectivity/gypsy/gypsy.inc
index 11a72046fe..0c1735e1b4 100644
--- a/meta/recipes-connectivity/gypsy/gypsy.inc
+++ b/meta/recipes-connectivity/gypsy/gypsy.inc
@@ -8,12 +8,8 @@ LICENSE = "GPLv2.0 & LGPLv2.1"
SECTION = "x11"
DEPENDS = "glib-2.0 dbus bluez4 dbus-glib"
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-doc
EXTRA_OECONF += "--with-distro=debian"
-do_configure_prepend () {
- touch ${S}/gtk-doc.make
-}
-
FILES_${PN} += "/usr/share/dbus-1/services/"
diff --git a/meta/recipes-connectivity/gypsy/gypsy_0.8.bb b/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
index 59a34fa66d..e7018383ea 100644
--- a/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
+++ b/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
@@ -16,7 +16,7 @@ DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt"
SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz \
file://fix-unused-but-set-variable-warning.patch \
"
-PR = "r2"
+PR = "r3"
inherit autotools pkgconfig
diff --git a/meta/recipes-connectivity/gypsy/gypsy_git.bb b/meta/recipes-connectivity/gypsy/gypsy_git.bb
index b123e11816..495467e146 100644
--- a/meta/recipes-connectivity/gypsy/gypsy_git.bb
+++ b/meta/recipes-connectivity/gypsy/gypsy_git.bb
@@ -4,6 +4,8 @@ DEFAULT_PREFERENCE = "-1"
SRCREV = "3652e1f37e82b8e63983e30fda3482cd099a8cf5"
PV = "0.8+git${SRCPV}"
+PR = "r1"
+
S = "${WORKDIR}/git"
LICENSE = "GPLv2+ & LGPLv2+"