From d4276bed389b7db06db58c7acebb83f92bff86a5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 2 Jun 2010 15:04:25 +0200 Subject: 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 Acked-by: Koen Kooi --- recipes/freesmartphone/fso-gsm0710muxd_git.bb | 2 +- recipes/freesmartphone/fsodatad_git.bb | 2 +- recipes/freesmartphone/fsodeviced_git.bb | 4 ++-- recipes/freesmartphone/fsomusicd_git.bb | 6 +++--- recipes/freesmartphone/fsonetworkd_git.bb | 2 +- recipes/freesmartphone/gsmd2_git.bb | 2 +- recipes/freesmartphone/opimd-utils_git.bb | 2 +- recipes/freesmartphone/zhone_git.bb | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'recipes/freesmartphone') diff --git a/recipes/freesmartphone/fso-gsm0710muxd_git.bb b/recipes/freesmartphone/fso-gsm0710muxd_git.bb index aec38f0dbe..6fae6af421 100644 --- a/recipes/freesmartphone/fso-gsm0710muxd_git.bb +++ b/recipes/freesmartphone/fso-gsm0710muxd_git.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/git" inherit autotools -RDEPENDS = "dbus dbus-glib" +RDEPENDS_${PN} = "dbus dbus-glib" RCONFLICTS = "gsm0710muxd" RREPLACES = "gsm0710muxd" diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb index 9892e12e39..1ee76cf0ef 100644 --- a/recipes/freesmartphone/fsodatad_git.bb +++ b/recipes/freesmartphone/fsodatad_git.bb @@ -9,4 +9,4 @@ DEPENDS += "\ libxml2 \ mobile-broadband-provider-info \ " -RDEPENDS += "mobile-broadband-provider-info" +RDEPENDS_${PN} += "mobile-broadband-provider-info" diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb index e7ea1c0a6a..2ceff82247 100644 --- a/recipes/freesmartphone/fsodeviced_git.bb +++ b/recipes/freesmartphone/fsodeviced_git.bb @@ -2,9 +2,9 @@ require cornucopia.inc inherit fso-plugin DEPENDS += "alsa-lib libcanberra libfsoresource" -RDEPENDS += "libcanberra-alsa" +RDEPENDS_${PN} += "libcanberra-alsa" # Included in fsodeviced itself now -# RRECOMMENDS += "fso-alsa-data" +# RRECOMMENDS_${PN} += "fso-alsa-data" RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "0.9.0+gitr${SRCPV}" diff --git a/recipes/freesmartphone/fsomusicd_git.bb b/recipes/freesmartphone/fsomusicd_git.bb index 2d1de2b56f..e542205e2c 100644 --- a/recipes/freesmartphone/fsomusicd_git.bb +++ b/recipes/freesmartphone/fsomusicd_git.bb @@ -1,6 +1,6 @@ require cornucopia.inc # Seems like bitbake cannot find dynamicaly created package names in -# gst-plugins.inc. Image creation usually fail with missing RDEPENDS for +# gst-plugins.inc. Image creation usually fail with missing RDEPENDS_${PN} for # gst-plugin-mad gst-plugin-flac gst-plugin-wavparse gst-plugin-sid # so add recipes needed for runtime dependencies manually here @@ -10,12 +10,12 @@ PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.3" PE = "1" -RDEPENDS += "\ +RDEPENDS_${PN} += "\ #gst-plugins-base gst-plugin-volume \ gst-plugin-alsa \ " -RRECOMMENDS += "\ +RRECOMMENDS_${PN} += "\ #gst-plugins-base gst-plugin-ogg \ gst-plugin-audioconvert \ diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb index 974ac3ccc7..9c6c7ba73b 100644 --- a/recipes/freesmartphone/fsonetworkd_git.bb +++ b/recipes/freesmartphone/fsonetworkd_git.bb @@ -4,4 +4,4 @@ SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "0.1.0.0+gitr${SRCPV}" PE = "1" PR = "${INC_PR}.3" -RDEPENDS += "iptables" +RDEPENDS_${PN} += "iptables" diff --git a/recipes/freesmartphone/gsmd2_git.bb b/recipes/freesmartphone/gsmd2_git.bb index 12ddac5d32..777a6f5dc4 100644 --- a/recipes/freesmartphone/gsmd2_git.bb +++ b/recipes/freesmartphone/gsmd2_git.bb @@ -16,4 +16,4 @@ inherit autotools EXTRA_OECONF = "--disable-tests" -RDEPENDS = "fso-gsm0710muxd" +RDEPENDS_${PN} = "fso-gsm0710muxd" diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb index 50fb8f37b5..34d18a0acf 100644 --- a/recipes/freesmartphone/opimd-utils_git.bb +++ b/recipes/freesmartphone/opimd-utils_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Test scripts for freesmartphone.org opimd interface" HOMEPAGE = "http://freesmartphone.org" SHR_RELEASE ?= "shr" LICENSE ?= "GPL" -RDEPENDS = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd" +RDEPENDS_${PN} = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd" SECTION = "x11/application" SRCREV = "98ccc66d1e0e5e74bd8ea8c761116fb6a1844fc7" PV = "0.0.3+gitr${SRCPV}" diff --git a/recipes/freesmartphone/zhone_git.bb b/recipes/freesmartphone/zhone_git.bb index c1559f4c25..86327bd8a3 100644 --- a/recipes/freesmartphone/zhone_git.bb +++ b/recipes/freesmartphone/zhone_git.bb @@ -20,7 +20,7 @@ do_install_append() { FILES_${PN} += "${datadir} ${sysconfdir}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ python-edbus \ python-edje \ python-ecore \ -- cgit 1.2.3-korg