From 1087a185246bbc5dac628ac9238d0ddf665ff660 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 27 Aug 2014 08:57:08 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/libxml/libxml2.inc | 2 ++ meta/recipes-core/udev/udev.inc | 2 +- meta/recipes-extended/pam/libpam_1.1.6.bb | 11 +++++++++-- meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb | 2 +- 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" inherit autotools pkgconfig binconfig-disabled pythonnative ptest +RDEPENDS_${PN}-ptest += "python-core" + RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141" # 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 \ file://init" inherit autotools pkgconfig update-rc.d ptest -RDEPENDS_${PN}-ptest += "make" +RDEPENDS_${PN}-ptest += "make perl" libexecdir = "${base_libdir}" EXTRA_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)}" RPROVIDES_${PN} += "${PN}-${libpam_suffix}" RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" -RDEPENDS_${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}" -RDEPENDS_${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" +RDEPENDS_${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} \ + " +RDEPENDS_${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 bash" #RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" python 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 \ file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" DEPENDS = "liburcu popt lttng-ust libxml2" -RDEPENDS_${PN}-ptest += "make" +RDEPENDS_${PN}-ptest += "make perl bash" SRCREV = "8b27cacb277c2cdab791139b08da8eb87ab14a88" PV = "v2.5.0" -- cgit v1.2.3-54-g00ecf