summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-08-27 08:57:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-28 15:12:44 +0100
commit1087a185246bbc5dac628ac9238d0ddf665ff660 (patch)
tree3bc7ee3da9077b299bba5e13dc5feb293c7d6b2b
parent44f98bbab857155c59df5f145c762462d8ae30f9 (diff)
downloadpoky-1087a185246bbc5dac628ac9238d0ddf665ff660.tar.gz
meta: fix RDEPNEDS for the test related pkgs
Add bash, python or perl to the ptest pkgs to fix the RDEPENDS issues. (From OE-Core rev: d081a85fc76e2b7a469c6c70175ecf7aed9de053) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/libxml/libxml2.inc2
-rw-r--r--meta/recipes-core/udev/udev.inc2
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.6.bb11
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb2
4 files changed, 13 insertions, 4 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 24ea66a0d8..92a25dcc2b 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -27,6 +27,8 @@ BINCONFIG = "${bindir}/xml2-config"
27 27
28inherit autotools pkgconfig binconfig-disabled pythonnative ptest 28inherit autotools pkgconfig binconfig-disabled pythonnative ptest
29 29
30RDEPENDS_${PN}-ptest += "python-core"
31
30RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141" 32RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141"
31 33
32# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header 34# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 11204aaa41..280da10b48 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -31,7 +31,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
31 file://init" 31 file://init"
32 32
33inherit autotools pkgconfig update-rc.d ptest 33inherit autotools pkgconfig update-rc.d ptest
34RDEPENDS_${PN}-ptest += "make" 34RDEPENDS_${PN}-ptest += "make perl"
35 35
36libexecdir = "${base_libdir}" 36libexecdir = "${base_libdir}"
37EXTRA_OECONF = "--disable-introspection \ 37EXTRA_OECONF = "--disable-introspection \
diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index c06709f512..d7033d02e7 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -72,8 +72,15 @@ libpam_suffix = "suffix${@get_multilib_bit(d)}"
72RPROVIDES_${PN} += "${PN}-${libpam_suffix}" 72RPROVIDES_${PN} += "${PN}-${libpam_suffix}"
73RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" 73RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}"
74 74
75RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix}" 75RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \
76RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} coreutils" 76 pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} \
77 pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix} \
78 "
79RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \
80 pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} \
81 pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} \
82 pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} \
83 coreutils bash"
77#RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" 84#RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}"
78 85
79python populate_packages_prepend () { 86python populate_packages_prepend () {
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb
index 14e5f9ebf2..560a2437ee 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" 10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
11 11
12DEPENDS = "liburcu popt lttng-ust libxml2" 12DEPENDS = "liburcu popt lttng-ust libxml2"
13RDEPENDS_${PN}-ptest += "make" 13RDEPENDS_${PN}-ptest += "make perl bash"
14 14
15SRCREV = "8b27cacb277c2cdab791139b08da8eb87ab14a88" 15SRCREV = "8b27cacb277c2cdab791139b08da8eb87ab14a88"
16PV = "v2.5.0" 16PV = "v2.5.0"