[oe-commits] Ross Burton : gypsy: inherit gtk-doc
git at git.openembedded.org
git at git.openembedded.org
Sun Jul 22 10:43:25 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 5caa2b521ed82cc1a223eddc59450ce68bbb3962
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5caa2b521ed82cc1a223eddc59450ce68bbb3962
Author: Ross Burton <ross.burton at intel.com>
Date: Thu Jul 19 15:15:09 2012 +0100
gypsy: inherit gtk-doc
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-connectivity/gypsy/gypsy.inc | 6 +-----
meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 2 +-
meta/recipes-connectivity/gypsy/gypsy_git.bb | 2 ++
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc b/meta/recipes-connectivity/gypsy/gypsy.inc
index 11a7204..0c1735e 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 59a34fa..e701838 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 b123e11..495467e 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+"
More information about the Openembedded-commits
mailing list