diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2010-12-23 20:23:33 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-30 10:03:10 +0000 |
| commit | 0e8f0f0a033c79611a15914fde5826876502af2e (patch) | |
| tree | 6eaed12c3fbab03d9adf193e923b6e20e2937f0d /meta/recipes-kernel | |
| parent | 35e3443b57d009bffd8904c7c6c3a4769193c1b4 (diff) | |
| download | poky-0e8f0f0a033c79611a15914fde5826876502af2e.tar.gz | |
RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/oprofile/oprofile_0.9.6.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-kernel/oprofile/oprofile_cvs.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-kernel/update-modules/update-modules_1.0.bb | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb b/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb index 85e065f999..eb707e06d1 100644 --- a/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb +++ b/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb | |||
| @@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
| 12 | SECTION = "devel" | 12 | SECTION = "devel" |
| 13 | 13 | ||
| 14 | DEPENDS = "popt binutils" | 14 | DEPENDS = "popt binutils" |
| 15 | RDEPENDS = "binutils-symlinks" | 15 | RDEPENDS_${PN} = "binutils-symlinks" |
| 16 | RRECOMMENDS = "kernel-vmlinux" | 16 | RRECOMMENDS_${PN} = "kernel-vmlinux" |
| 17 | 17 | ||
| 18 | PR = "r0" | 18 | PR = "r1" |
| 19 | 19 | ||
| 20 | SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ | 20 | SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ |
| 21 | file://opstart.patch \ | 21 | file://opstart.patch \ |
diff --git a/meta/recipes-kernel/oprofile/oprofile_cvs.bb b/meta/recipes-kernel/oprofile/oprofile_cvs.bb index f2ff5adfc2..f2b5520f63 100644 --- a/meta/recipes-kernel/oprofile/oprofile_cvs.bb +++ b/meta/recipes-kernel/oprofile/oprofile_cvs.bb | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | PV = "0.9.4+cvs${SRCDATE}" | 1 | PV = "0.9.4+cvs${SRCDATE}" |
| 2 | PR = "r0" | 2 | PR = "r1" |
| 3 | SECTION = "devel" | 3 | SECTION = "devel" |
| 4 | SUMMARY = "System-Wide Profiler" | 4 | SUMMARY = "System-Wide Profiler" |
| 5 | DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ | 5 | DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ |
| 6 | of profiling all running code at low overhead." | 6 | of profiling all running code at low overhead." |
| 7 | LICENSE = "GPL" | 7 | LICENSE = "GPL" |
| 8 | DEPENDS = "popt binutils" | 8 | DEPENDS = "popt binutils" |
| 9 | RDEPENDS = "binutils-symlinks" | 9 | RDEPENDS_${PN} = "binutils-symlinks" |
| 10 | RRECOMMENDS = "kernel-vmlinux" | 10 | RRECOMMENDS_${PN} = "kernel-vmlinux" |
| 11 | 11 | ||
| 12 | DEFAULT_PREFERENCE = "-1" | 12 | DEFAULT_PREFERENCE = "-1" |
| 13 | 13 | ||
diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb index 93bc1493d9..a473bb58c7 100644 --- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb +++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb | |||
| @@ -4,8 +4,8 @@ LICENSE = "GPLv2" | |||
| 4 | LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" |
| 5 | 5 | ||
| 6 | PACKAGE_ARCH = "all" | 6 | PACKAGE_ARCH = "all" |
| 7 | RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " | 7 | RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " |
| 8 | PR = "r7" | 8 | PR = "r8" |
| 9 | 9 | ||
| 10 | SRC_URI = "file://update-modules \ | 10 | SRC_URI = "file://update-modules \ |
| 11 | file://COPYING.GPL" | 11 | file://COPYING.GPL" |
| @@ -25,7 +25,7 @@ do_install() { | |||
| 25 | # The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which | 25 | # The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which |
| 26 | # supports both 2.4 and 2.6 kernels. Rather than forcing OE to have | 26 | # supports both 2.4 and 2.6 kernels. Rather than forcing OE to have |
| 27 | # to deal with that unique legacy corner case, we just nullify the | 27 | # to deal with that unique legacy corner case, we just nullify the |
| 28 | # RDEPENDS here and handle it in the Unslung image recipe. I know this | 28 | # RDEPENDS_${PN} here and handle it in the Unslung image recipe. I know this |
| 29 | # is ugly. Please don't remove it unless you first make the RDEPENDS | 29 | # is ugly. Please don't remove it unless you first make the RDEPENDS |
| 30 | # line at the top of this file understand that a machine can be used | 30 | # line at the top of this file understand that a machine can be used |
| 31 | # in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's | 31 | # in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's |
