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/tasks/mamona-sdk.inc | 2 +- recipes/tasks/task-devimage.bb | 4 ++-- recipes/tasks/task-efl.bb | 2 +- recipes/tasks/task-mamona-base.bb | 2 +- recipes/tasks/task-mamona-devel.bb | 2 +- recipes/tasks/task-mamona-python.bb | 2 +- recipes/tasks/task-mamona-sdk-noemu.bb | 2 +- recipes/tasks/task-mamona-sdk.bb | 2 +- recipes/tasks/task-mamona-systemtap.bb | 2 +- recipes/tasks/task-mamona-wm.bb | 2 +- recipes/tasks/task-mamona.bb | 2 +- recipes/tasks/task-mipl.bb | 4 ++-- recipes/tasks/task-openprotium.bb | 4 ++-- recipes/tasks/task-python-efl-examples.bb | 2 +- recipes/tasks/task-python-efl.bb | 2 +- recipes/tasks/task-python-everything.bb | 2 +- recipes/tasks/task-python-sharprom_20060425.bb | 2 +- recipes/tasks/task-sdk-base.bb | 2 +- recipes/tasks/task-sdk-gpephone.bb | 2 +- recipes/tasks/task-sdk-sbox-gpe.bb | 2 +- recipes/tasks/task-sdk-sbox.bb | 2 +- recipes/tasks/task-self-hosting.bb | 2 +- recipes/tasks/task-slugos.bb | 12 ++++++------ 23 files changed, 31 insertions(+), 31 deletions(-) (limited to 'recipes/tasks') diff --git a/recipes/tasks/mamona-sdk.inc b/recipes/tasks/mamona-sdk.inc index fb54eab541..bbf3309702 100644 --- a/recipes/tasks/mamona-sdk.inc +++ b/recipes/tasks/mamona-sdk.inc @@ -4,7 +4,7 @@ ALLOW_EMPTY = "1" PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-mamona \ automake \ bison \ diff --git a/recipes/tasks/task-devimage.bb b/recipes/tasks/task-devimage.bb index 2bea4bbefc..1eff219563 100644 --- a/recipes/tasks/task-devimage.bb +++ b/recipes/tasks/task-devimage.bb @@ -7,7 +7,7 @@ inherit task DEVIMAGE_EXTRA_RDEPENDS ?= "" DEVIMAGE_EXTRA_RRECOMMENDS ?= "" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ devimage \ busybox dropbear udev \ util-linux-mount \ @@ -18,7 +18,7 @@ RDEPENDS = "\ ${DEVIMAGE_EXTRA_RDEPENDS} \ " -RRECOMMENDS = "\ +RRECOMMENDS_${PN} = "\ kernel \ kernel-image \ kernel-module-msdos \ diff --git a/recipes/tasks/task-efl.bb b/recipes/tasks/task-efl.bb index 00236a4050..21763108d2 100644 --- a/recipes/tasks/task-efl.bb +++ b/recipes/tasks/task-efl.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Task package: Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/efl" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ eet \ evas \ ecore \ diff --git a/recipes/tasks/task-mamona-base.bb b/recipes/tasks/task-mamona-base.bb index 29e88ff4fa..1c3f2264a1 100644 --- a/recipes/tasks/task-mamona-base.bb +++ b/recipes/tasks/task-mamona-base.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ apt \ base-files \ base-passwd \ diff --git a/recipes/tasks/task-mamona-devel.bb b/recipes/tasks/task-mamona-devel.bb index a33083450f..012ea3f5da 100644 --- a/recipes/tasks/task-mamona-devel.bb +++ b/recipes/tasks/task-mamona-devel.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-mamona \ gdb \ strace \ diff --git a/recipes/tasks/task-mamona-python.bb b/recipes/tasks/task-mamona-python.bb index f17d6e731f..d8b06706e4 100644 --- a/recipes/tasks/task-mamona-python.bb +++ b/recipes/tasks/task-mamona-python.bb @@ -4,7 +4,7 @@ PR = "r0" PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ python-ao \ python-cheetah \ python-constraint \ diff --git a/recipes/tasks/task-mamona-sdk-noemu.bb b/recipes/tasks/task-mamona-sdk-noemu.bb index 0ef65b916c..31e7215ae5 100644 --- a/recipes/tasks/task-mamona-sdk-noemu.bb +++ b/recipes/tasks/task-mamona-sdk-noemu.bb @@ -5,7 +5,7 @@ require mamona-sdk.inc RCONFLICTS = "task-mamona-sdk" RREPLACES = "task-mamona-sdk" -RDEPENDS += "\ +RDEPENDS_${PN} += "\ bash-noemu \ binutils-noemu \ binutils-noemu-symlinks \ diff --git a/recipes/tasks/task-mamona-sdk.bb b/recipes/tasks/task-mamona-sdk.bb index 6e5786517a..d2b1fcac75 100644 --- a/recipes/tasks/task-mamona-sdk.bb +++ b/recipes/tasks/task-mamona-sdk.bb @@ -5,7 +5,7 @@ include mamona-sdk.inc RCONFLICTS = "task-mamona-sdk-noemu" RREPLACES = "task-mamona-sdk-noemu" -RDEPENDS += "\ +RDEPENDS_${PN} += "\ bash \ binutils \ binutils-symlinks \ diff --git a/recipes/tasks/task-mamona-systemtap.bb b/recipes/tasks/task-mamona-systemtap.bb index 01664d3e26..d57716194c 100644 --- a/recipes/tasks/task-mamona-systemtap.bb +++ b/recipes/tasks/task-mamona-systemtap.bb @@ -4,7 +4,7 @@ ALLOW_EMPTY = "1" PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ libcap \ systemtap \ task-mamona-sdk \ diff --git a/recipes/tasks/task-mamona-wm.bb b/recipes/tasks/task-mamona-wm.bb index 55893e0eac..cfa0ecee46 100644 --- a/recipes/tasks/task-mamona-wm.bb +++ b/recipes/tasks/task-mamona-wm.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-mamona \ e-wm \ libmamona-im-ecore \ diff --git a/recipes/tasks/task-mamona.bb b/recipes/tasks/task-mamona.bb index 372af29f85..9448eb096a 100644 --- a/recipes/tasks/task-mamona.bb +++ b/recipes/tasks/task-mamona.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-mamona-base \ alsa-conf-base \ alsa-utils-alsamixer \ diff --git a/recipes/tasks/task-mipl.bb b/recipes/tasks/task-mipl.bb index a2eff400a7..1ee240350c 100644 --- a/recipes/tasks/task-mipl.bb +++ b/recipes/tasks/task-mipl.bb @@ -7,8 +7,8 @@ DESCRIPTION = "Mobile ipv6 extensions" inherit task -RDEPENDS = "mipv6" -RRECOMMENDS = "kernel-module-ipv6 \ +RDEPENDS_${PN} = "mipv6" +RRECOMMENDS_${PN} = "kernel-module-ipv6 \ kernel-module-mip6 \ " diff --git a/recipes/tasks/task-openprotium.bb b/recipes/tasks/task-openprotium.bb index 4a8e1e45ad..68e093e823 100644 --- a/recipes/tasks/task-openprotium.bb +++ b/recipes/tasks/task-openprotium.bb @@ -23,7 +23,7 @@ DISTRO_EXTRA_RDEPENDS += "diffutils cpio findutils" # pick up the fw_set/get env utils. DISTRO_EXTRA_RDEPENDS += "u-boot-utils" -RDEPENDS = " kernel \ +RDEPENDS_${PN} = " kernel \ base-files \ base-passwd \ netbase \ @@ -47,6 +47,6 @@ RDEPENDS = " kernel \ ${MACHINE_EXTRA_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS} " -RRECOMMENDS += " \ +RRECOMMENDS_${PN} += " \ ${DISTRO_EXTRA_RRECOMMENDS} \ ${MACHINE_EXTRA_RRECOMMENDS}" diff --git a/recipes/tasks/task-python-efl-examples.bb b/recipes/tasks/task-python-efl-examples.bb index d882ceccc4..3bd4b58a58 100644 --- a/recipes/tasks/task-python-efl-examples.bb +++ b/recipes/tasks/task-python-efl-examples.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-python-efl \ python-ecore-examples \ python-emotion-examples \ diff --git a/recipes/tasks/task-python-efl.bb b/recipes/tasks/task-python-efl.bb index 79d50c7a16..fc22f108b5 100644 --- a/recipes/tasks/task-python-efl.bb +++ b/recipes/tasks/task-python-efl.bb @@ -5,7 +5,7 @@ PR = "ml4.1" ALLOW_EMPTY = "1" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ python-evas \ python-ecore \ python-edje \ diff --git a/recipes/tasks/task-python-everything.bb b/recipes/tasks/task-python-everything.bb index 16a48f2660..b6b327fa52 100644 --- a/recipes/tasks/task-python-everything.bb +++ b/recipes/tasks/task-python-everything.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" PV = "2.6" PR = "ml44" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ python-ao \ python-cheetah \ python-coherence \ diff --git a/recipes/tasks/task-python-sharprom_20060425.bb b/recipes/tasks/task-python-sharprom_20060425.bb index 5dbd59d18a..4aac5e9e04 100644 --- a/recipes/tasks/task-python-sharprom_20060425.bb +++ b/recipes/tasks/task-python-sharprom_20060425.bb @@ -16,7 +16,7 @@ NONWORKING = "\ python-sword \ python-vorbis" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ python-ao \ python-constraint \ python-dialog \ diff --git a/recipes/tasks/task-sdk-base.bb b/recipes/tasks/task-sdk-base.bb index 0dc41f3d37..5143470bd5 100644 --- a/recipes/tasks/task-sdk-base.bb +++ b/recipes/tasks/task-sdk-base.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" DEPENDS = "task-sdk-bare" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-sdk-bare \ glibc \ virtual-libc-dev \ diff --git a/recipes/tasks/task-sdk-gpephone.bb b/recipes/tasks/task-sdk-gpephone.bb index 7a9f78cfdd..2641adb6fe 100644 --- a/recipes/tasks/task-sdk-gpephone.bb +++ b/recipes/tasks/task-sdk-gpephone.bb @@ -3,7 +3,7 @@ PR = "r0" LICENSE = "MIT" ALLOW_EMPTY = "1" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ libidn-dev \ libim-dev \ gloox-dev \ diff --git a/recipes/tasks/task-sdk-sbox-gpe.bb b/recipes/tasks/task-sdk-sbox-gpe.bb index 930de7cd2e..51ab447050 100644 --- a/recipes/tasks/task-sdk-sbox-gpe.bb +++ b/recipes/tasks/task-sdk-sbox-gpe.bb @@ -3,7 +3,7 @@ PR = "r0" LICENSE = "MIT" ALLOW_EMPTY = "1" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ glib-2.0-utils \ gdk-pixbuf-loader-png \ gdk-pixbuf-loader-jpeg \ diff --git a/recipes/tasks/task-sdk-sbox.bb b/recipes/tasks/task-sdk-sbox.bb index d50954a9cf..3226e374ea 100644 --- a/recipes/tasks/task-sdk-sbox.bb +++ b/recipes/tasks/task-sdk-sbox.bb @@ -3,7 +3,7 @@ PR = "r7" LICENSE = "MIT" ALLOW_EMPTY = "1" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ strace \ gdb \ sbrsh \ diff --git a/recipes/tasks/task-self-hosting.bb b/recipes/tasks/task-self-hosting.bb index 38f2cb1f91..5ee20d5ea1 100644 --- a/recipes/tasks/task-self-hosting.bb +++ b/recipes/tasks/task-self-hosting.bb @@ -1,7 +1,7 @@ DESCRIPTION = "All tools needed for OpenEmbedded build" SECTION = "devel" LICENSE = "MIT" -RDEPENDS = "task-native-sdk python-modules bash texinfo cvs subversion git" +RDEPENDS_${PN} = "task-native-sdk python-modules bash texinfo cvs subversion git" PR = "r1" # diff --git a/recipes/tasks/task-slugos.bb b/recipes/tasks/task-slugos.bb index 0ebf149480..69bf6caf11 100644 --- a/recipes/tasks/task-slugos.bb +++ b/recipes/tasks/task-slugos.bb @@ -81,7 +81,7 @@ kernel-module-md-mod \ kernel-module-raid1 \ " -# Add the machine-specific RRECOMMENDS stuff -- kernel modules required for +# Add the machine-specific RRECOMMENDS_${PN} stuff -- kernel modules required for # network support. SLUGOS_MACHINE_RRECOMMENDS_nslu2 = "\ kernel-module-mii \ @@ -89,7 +89,7 @@ kernel-module-ixp4xx-mac \ kernel-module-ixp4xx-qmgr \ " -# Add machine-specific RDEPENDS stuff - packages such as the NPE firmware +# Add machine-specific RDEPENDS_${PN} stuff - packages such as the NPE firmware SLUGOS_MACHINE_RDEPENDS_nslu2 = "\ ixp4xx-npe \ " @@ -100,7 +100,7 @@ DEPENDS += "${DISTRO_EXTRA_DEPENDS}" DISTRO_EXTRA_RDEPENDS ?= "" ## This comment block is temporary, to be removed once SlugOS 5.0 stabilizes -##RDEPENDS += "\ +##RDEPENDS_${PN} += "\ ## kernel ixp4xx-npe \ ## base-files base-passwd netbase \ ## busybox initscripts-slugos slugos-init \ @@ -115,7 +115,7 @@ DISTRO_EXTRA_RDEPENDS ?= "" ## util-linux-losetup \ ## ${SLUGOS_STANDARD_RDEPENDS} \ ## ${DISTRO_EXTRA_RDEPENDS}" -## SlugOS 5.0 - original RDEPENDS above for reference; tinylogin and the +## SlugOS 5.0 - original RDEPENDS_${PN} above for reference; tinylogin and the ## util-linux-* utilities are now replaced by busybox tools. Also, ipkg ## is replaced by a trimmed-down version of opkg (no package signatures, ## and it uses the busybox wget command instead of libcurl - MJW @@ -123,7 +123,7 @@ DISTRO_EXTRA_RDEPENDS ?= "" ## SlugOS 5.2 - module-init-tools reinstated due to busybox bugs - MJW ## SlugOS 5.4 - util-linux-mount reinstated due to busybox bugs - MJW -RDEPENDS += "\ +RDEPENDS_${PN} += "\ kernel \ base-files base-passwd netbase \ busybox initscripts-slugos slugos-init \ @@ -138,7 +138,7 @@ RDEPENDS += "\ ${DISTRO_EXTRA_RDEPENDS}" DISTRO_EXTRA_RRECOMMENDS ?= "" -RRECOMMENDS += "\ +RRECOMMENDS_${PN} += "\ openssh \ ${SLUGOS_STANDARD_RRECOMMENDS} \ ${SLUGOS_MACHINE_RRECOMMENDS} \ -- cgit 1.2.3-korg