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/meta/canadian-sdk.bb | 2 +- recipes/meta/meta-angstrom-2007.bb | 8 ++++---- recipes/meta/meta-e-x11-core.bb | 2 +- recipes/meta/meta-e-x11.bb | 2 +- recipes/meta/meta-gpe-extras.bb | 2 +- recipes/meta/meta-gpe.bb | 2 +- recipes/meta/meta-maemo.bb | 2 +- recipes/meta/meta-mamona-light.bb | 2 +- recipes/meta/meta-mamona.bb | 2 +- recipes/meta/meta-nas-server.bb | 2 +- recipes/meta/meta-opie-all.bb | 2 +- recipes/meta/meta-opie.bb | 2 +- recipes/meta/meta-sdl.bb | 2 +- recipes/meta/meta-toolchain.bb | 2 +- recipes/meta/openmoko-feed.bb | 2 +- recipes/meta/slugos-native.bb | 2 +- recipes/meta/xbase-clients.bb | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) (limited to 'recipes/meta') diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb index 86b645bb7f..47529a2d96 100644 --- a/recipes/meta/canadian-sdk.bb +++ b/recipes/meta/canadian-sdk.bb @@ -32,7 +32,7 @@ FEED_ARCH ?= "${TARGET_ARCH}" SDK_SUFFIX = "toolchain" TOOLCHAIN_OUTPUTNAME ?= "${SDK_SYS}-${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}" -RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_CANADIAN_HOST_TASK}" +RDEPENDS_${PN} = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_CANADIAN_HOST_TASK}" TOOLCHAIN_FEED_URI ?= "${DISTRO_FEED_URI}" diff --git a/recipes/meta/meta-angstrom-2007.bb b/recipes/meta/meta-angstrom-2007.bb index a3a2c78a79..8355b10810 100644 --- a/recipes/meta/meta-angstrom-2007.bb +++ b/recipes/meta/meta-angstrom-2007.bb @@ -5,16 +5,16 @@ inherit meta -RDEPENDS = "" +RDEPENDS_${PN} = "" # Basic tools -RDEPENDS += " \ +RDEPENDS_${PN} += " \ task-proper-tools \ screen \ " # Browsers know to work on all archs -RDEPENDS += " \ +RDEPENDS_${PN} += " \ gpe-mini-browser \ midori \ minimo \ @@ -23,7 +23,7 @@ RDEPENDS += " \ " # Webservers -RDEPENDS += " \ +RDEPENDS_${PN} += " \ apache2 \ boa \ cherokee \ diff --git a/recipes/meta/meta-e-x11-core.bb b/recipes/meta/meta-e-x11-core.bb index 58ea1b4ebf..3f223992d9 100644 --- a/recipes/meta/meta-e-x11-core.bb +++ b/recipes/meta/meta-e-x11-core.bb @@ -5,6 +5,6 @@ PR = "r1" PACKAGE_ARCH = "all" LICENSE = "MIT" -RDEPENDS = "task-e-x11-core" +RDEPENDS_${PN} = "task-e-x11-core" inherit meta diff --git a/recipes/meta/meta-e-x11.bb b/recipes/meta/meta-e-x11.bb index c0b430be1a..25d42e4aaf 100644 --- a/recipes/meta/meta-e-x11.bb +++ b/recipes/meta/meta-e-x11.bb @@ -5,6 +5,6 @@ PR = "r1" PACKAGE_ARCH = "all" LICENSE = "MIT" -RDEPENDS = "task-e-x11" +RDEPENDS_${PN} = "task-e-x11" inherit meta diff --git a/recipes/meta/meta-gpe-extras.bb b/recipes/meta/meta-gpe-extras.bb index 24be1295e4..7d7739a5b1 100644 --- a/recipes/meta/meta-gpe-extras.bb +++ b/recipes/meta/meta-gpe-extras.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environmen LICENSE = "MIT" PR ="r3" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-gpe-apps \ task-gpe-games \ task-gpe-web \ diff --git a/recipes/meta/meta-gpe.bb b/recipes/meta/meta-gpe.bb index 15e9fd1911..40de91dc58 100644 --- a/recipes/meta/meta-gpe.bb +++ b/recipes/meta/meta-gpe.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment" LICENSE = "MIT" PR = "r43" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-gpe-base \ task-gpe-settings \ task-gpe-pim \ diff --git a/recipes/meta/meta-maemo.bb b/recipes/meta/meta-maemo.bb index 6669a5056b..d18497a097 100644 --- a/recipes/meta/meta-maemo.bb +++ b/recipes/meta/meta-maemo.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for maemo environment" LICENSE = "MIT" PR = "r0" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ maemo-task-base \ maemo-task-apps \ maemo-task-libs-install \ diff --git a/recipes/meta/meta-mamona-light.bb b/recipes/meta/meta-mamona-light.bb index 562ba5b639..b03923cc0c 100644 --- a/recipes/meta/meta-mamona-light.bb +++ b/recipes/meta/meta-mamona-light.bb @@ -5,7 +5,7 @@ PR = "r1" inherit meta EXCLUDE_FROM_WORLD = "1" -RDEPENDS = " \ +RDEPENDS_${PN} = " \ task-mamona \ " diff --git a/recipes/meta/meta-mamona.bb b/recipes/meta/meta-mamona.bb index a7e3d9f89e..44d50594a8 100644 --- a/recipes/meta/meta-mamona.bb +++ b/recipes/meta/meta-mamona.bb @@ -5,7 +5,7 @@ PR = "r2" inherit meta EXCLUDE_FROM_WORLD = "1" -RDEPENDS = " \ +RDEPENDS_${PN} = " \ task-mamona-base \ task-mamona \ task-mamona-devel \ diff --git a/recipes/meta/meta-nas-server.bb b/recipes/meta/meta-nas-server.bb index 3deb44c2bd..114c15b070 100644 --- a/recipes/meta/meta-nas-server.bb +++ b/recipes/meta/meta-nas-server.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for a network attached storage server" LICENSE = "MIT" PR = "r0" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-nas-server-everything \ " diff --git a/recipes/meta/meta-opie-all.bb b/recipes/meta/meta-opie-all.bb index 90b3912106..0f80754262 100644 --- a/recipes/meta/meta-opie-all.bb +++ b/recipes/meta/meta-opie-all.bb @@ -3,7 +3,7 @@ SECTION = "opie/base" LICENSE = "MIT" PR = "r3" -RDEPENDS = " \ +RDEPENDS_${PN} = " \ task-qpe-applets \ task-qpe-games \ task-qpe-inputmethods \ diff --git a/recipes/meta/meta-opie.bb b/recipes/meta/meta-opie.bb index 04b20c38d4..55576d265f 100644 --- a/recipes/meta/meta-opie.bb +++ b/recipes/meta/meta-opie.bb @@ -3,7 +3,7 @@ SECTION = "opie/base" PR = "r34" LICENSE = "MIT" -RDEPENDS = "task-opie-applets task-opie-apps task-opie-base \ +RDEPENDS_${PN} = "task-opie-applets task-opie-apps task-opie-base \ task-opie-base-applets task-opie-base-apps \ task-opie-base-decorations task-opie-base-inputmethods \ task-opie-base-pim task-opie-base-settings \ diff --git a/recipes/meta/meta-sdl.bb b/recipes/meta/meta-sdl.bb index 8b2fbcdee9..bf5307fceb 100644 --- a/recipes/meta/meta-sdl.bb +++ b/recipes/meta/meta-sdl.bb @@ -2,6 +2,6 @@ DESCRIPTION = "Meta-package for SDL" LICENSE = "MIT" PR = "r2" -RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators" +RDEPENDS_${PN} = "task-sdl-libs task-sdl-games task-sdl-emulators" inherit meta diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb index adc057a253..064fc3b193 100644 --- a/recipes/meta/meta-toolchain.bb +++ b/recipes/meta/meta-toolchain.bb @@ -21,7 +21,7 @@ TOOLCHAIN_OUTPUTNAME ?= "${DISTRO}-${DISTRO_VERSION}-${SDK_SYS}-${FEED_ARCH}-${T DISTRO_FEED_CONFIGS ?= " " -RDEPENDS = "${DISTRO_FEED_CONFIGS} ${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" +RDEPENDS_${PN} = "${DISTRO_FEED_CONFIGS} ${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" TOOLCHAIN_FEED_URI ?= "${DISTRO_FEED_URI}" diff --git a/recipes/meta/openmoko-feed.bb b/recipes/meta/openmoko-feed.bb index 9cc227c62e..21bdbc625b 100644 --- a/recipes/meta/openmoko-feed.bb +++ b/recipes/meta/openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Openmoko Misc. Feed Items" LICENSE = "MIT" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-openmoko-debug \ task-openmoko-native-sdk \ task-openmoko-feed \ diff --git a/recipes/meta/slugos-native.bb b/recipes/meta/slugos-native.bb index 9dae7e8df3..5247a166f7 100644 --- a/recipes/meta/slugos-native.bb +++ b/recipes/meta/slugos-native.bb @@ -98,5 +98,5 @@ SLUGOS_NATIVE_DP = "\ python \ " -RDEPENDS = '${SLUGOS_NATIVE_RT} ${SLUGOS_NATIVE}' +RDEPENDS_${PN} = '${SLUGOS_NATIVE_RT} ${SLUGOS_NATIVE}' DEPENDS = '${SLUGOS_NATIVE_DP} ${SLUGOS_NATIVE}' diff --git a/recipes/meta/xbase-clients.bb b/recipes/meta/xbase-clients.bb index 5f3c640f00..35ca4e6f44 100644 --- a/recipes/meta/xbase-clients.bb +++ b/recipes/meta/xbase-clients.bb @@ -5,7 +5,7 @@ PR = "r1" ALLOW_EMPTY = "1" PACKAGES = "${PN}" -RDEPENDS = 'xauth \ +RDEPENDS_${PN} = 'xauth \ xhost \ xmodmap \ xrdb \ -- cgit 1.2.3-korg