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/mplayer/mplayer-maemo_svn.bb | 2 +- recipes/mplayer/mplayer_0.0+1.0rc1.bb | 2 +- recipes/mplayer/mplayer_0.0+1.0rc2.bb | 2 +- recipes/mplayer/mplayer_git.bb | 2 +- recipes/mplayer/mplayer_svn.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes/mplayer') diff --git a/recipes/mplayer/mplayer-maemo_svn.bb b/recipes/mplayer/mplayer-maemo_svn.bb index 685138702f..f52eb2eed8 100644 --- a/recipes/mplayer/mplayer-maemo_svn.bb +++ b/recipes/mplayer/mplayer-maemo_svn.bb @@ -12,7 +12,7 @@ PE = "1" RCONFLICTS_${PN} = "mplayer" -RDEPENDS = "mplayer-common" +RDEPENDS_${PN} = "mplayer-common" LICENSE = "GPL" SRC_URI = "svn://garage.maemo.org/svn/mplayer/;module=trunk;proto=https \ file://Makefile-codec-cfg.patch \ diff --git a/recipes/mplayer/mplayer_0.0+1.0rc1.bb b/recipes/mplayer/mplayer_0.0+1.0rc1.bb index cb6ce51e70..28967ccb7d 100644 --- a/recipes/mplayer/mplayer_0.0+1.0rc1.bb +++ b/recipes/mplayer/mplayer_0.0+1.0rc1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" DEPENDS = "virtual/libsdl zlib libpng jpeg freetype fontconfig alsa-lib lzo ncurses libxv virtual/libx11 \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" -RDEPENDS = "mplayer-common" +RDEPENDS_${PN} = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2;name=archive \ file://vo_w100.c \ diff --git a/recipes/mplayer/mplayer_0.0+1.0rc2.bb b/recipes/mplayer/mplayer_0.0+1.0rc2.bb index 876c88bbce..5adf23827d 100644 --- a/recipes/mplayer/mplayer_0.0+1.0rc2.bb +++ b/recipes/mplayer/mplayer_0.0+1.0rc2.bb @@ -9,7 +9,7 @@ DEPENDS_append_hx4700 = " libw100 " DEFAULT_PREFERENCE_avr32 = "1" -RDEPENDS = "mplayer-common" +RDEPENDS_${PN} = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2 \ file://vo_w100.c \ diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb index c08676ab1f..49124e27d1 100644 --- a/recipes/mplayer/mplayer_git.bb +++ b/recipes/mplayer/mplayer_git.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/" DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 virtual/kernel \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" -RDEPENDS = "mplayer-common" +RDEPENDS_${PN} = "mplayer-common" LICENSE = "GPL" SRC_URI = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=master \ file://makefile-nostrip-svn.patch \ diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index ae24cdba49..c197d67468 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/" DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 virtual/kernel \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" -RDEPENDS = "mplayer-common" +RDEPENDS_${PN} = "mplayer-common" LICENSE = "GPL" SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ file://makefile-nostrip-svn.patch \ -- cgit 1.2.3-korg