aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/navit
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-06-02 15:04:25 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-06-03 07:33:27 +0200
commitd4276bed389b7db06db58c7acebb83f92bff86a5 (patch)
tree2386574b6ab0c36a58a314a24d31f6b5c9291a65 /recipes/navit
parent823aa270059259ca619e21a5d9b22e86afb12f3b (diff)
downloadopenembedded-d4276bed389b7db06db58c7acebb83f92bff86a5.tar.gz
recipes: conform to OE packaging guidelines with RDEPENDS/RRECOMMENDS
* there is probably very few cases when it's needed without _${PN}, if you find one in attached patch, please enlighten me * usually we want those only for ${PN} not for all ${PACKAGES} ie ${PN}-dev, ${PN)-doc etc * there is a check for this in recipe-sanity.bclass * there is maybe few possible fixes also in bbclasses cpan-base.bbclass:RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" distutils-base.bbclass:RDEPENDS += "python-core" gtk-icon-cache.bbclass:RDEPENDS += "hicolor-icon-theme" image.bbclass:RDEPENDS += "${IMAGE_INSTALL} ${IMAGE_BOOT}" module.bbclass:RDEPENDS += "kernel (${KERNEL_VERSION}) update-modules" ?opie_i18n.bbclass: rdepends = bb.data.getVar("RDEPENDS", d, 1) ?opie_i18n.bbclass: bb.data.setVar('RDEPENDS_%s' % x[0].lower(), pn, d) ?opie_i18n.bbclass: bb.data.setVar('RDEPENDS', rdepends, d) rubyextension.bbclass:RDEPENDS += "ruby" Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <k-kooi@ti.com>
Diffstat (limited to 'recipes/navit')
-rw-r--r--recipes/navit/navit-icons_svn.bb2
-rw-r--r--recipes/navit/navit.inc2
-rw-r--r--recipes/navit/navit_svn.bb4
3 files changed, 4 insertions, 4 deletions
diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb
index 92f7a5ee58..80b77c221b 100644
--- a/recipes/navit/navit-icons_svn.bb
+++ b/recipes/navit/navit-icons_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Navit is a car navigation system with routing engine."
LICENSE = "GPL"
SECTION = "x11/applications"
DEPENDS = "glib-2.0 gtk+ imagemagick-native librsvg-native"
-RRECOMMENDS = "gpsd espeak flite"
+RRECOMMENDS_${PN} = "gpsd espeak flite"
#only icons present in the package
PACKAGE_ARCH = "all"
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index ad29f347ed..32f6233d3d 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Navit is a car navigation system with routing engine."
LICENSE = "GPL"
SECTION = "x11/applications"
DEPENDS = "glib-2.0 gtk+"
-RRECOMMENDS = "gpsd speechd flite"
+RRECOMMENDS_${PN} = "gpsd speechd flite"
PE = "1"
INC_PR = "r5"
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index 7cde0381d6..e74189bbfc 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -6,11 +6,11 @@ PR = "${INC_PR}.5"
S = "${WORKDIR}/navit"
# override navit.inc RRECOMMENDS, we only suggest a text2speech app
-RRECOMMENDS = "gpsd"
+RRECOMMENDS_${PN} = "gpsd"
RSUGGESTS_${PN} = "flite espeak"
DEPENDS_shr += " gd librsvg-native"
-RDEPENDS = " navit-icons"
+RDEPENDS_${PN} = " navit-icons"
EXTRA_OECONF += " --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher --enable-cache-size=20971520"
SRCREV = "3279"