summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-09-19 15:44:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-02 10:09:47 +0100
commitc21d6a80f9e82de6bf8e892694ca9fc50ec27e79 (patch)
treebc60d813382b315c9b418a36e67e239a1cd3bdd9 /meta
parentb3e0775fcf6c23af0812d2e349fa708a62dae5bc (diff)
downloadpoky-c21d6a80f9e82de6bf8e892694ca9fc50ec27e79.tar.gz
python: add tk-lib as runtime dependency for python-tkinter
Fixes: ERROR: python-2.7.16-r0 do_package_qa: QA Issue: /usr/lib/python2.7/lib-dynload/_tkinter.so contained in package python-tkinter requires libtk8.6.so, but no providers found in RDEPENDS_python-tkinter? [file-rdeps] (From OE-Core rev: f78248a2380bbbbf271b5bb02c762f5bc7a3a92e) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python3_3.7.4.bb2
-rw-r--r--meta/recipes-devtools/python/python_2.7.16.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python3_3.7.4.bb b/meta/recipes-devtools/python/python3_3.7.4.bb
index 14119c33f9..8693c446c2 100644
--- a/meta/recipes-devtools/python/python3_3.7.4.bb
+++ b/meta/recipes-devtools/python/python3_3.7.4.bb
@@ -321,6 +321,6 @@ FILES_${PN}-man = "${datadir}/man"
321 321
322RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2 libgcc tzdata-europe coreutils sed" 322RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2 libgcc tzdata-europe coreutils sed"
323RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-tr-tr.iso-8859-9" 323RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-tr-tr.iso-8859-9"
324RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '', d)}" 324RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk tk-lib', '', d)}"
325RDEPENDS_${PN}-dev = "" 325RDEPENDS_${PN}-dev = ""
326 326
diff --git a/meta/recipes-devtools/python/python_2.7.16.bb b/meta/recipes-devtools/python/python_2.7.16.bb
index c093f84a35..5b856a5097 100644
--- a/meta/recipes-devtools/python/python_2.7.16.bb
+++ b/meta/recipes-devtools/python/python_2.7.16.bb
@@ -173,7 +173,7 @@ RDEPENDS_${PN}-modules += "${PN}-misc"
173 173
174# ptest 174# ptest
175RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip tzdata-europe coreutils sed" 175RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip tzdata-europe coreutils sed"
176RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '', d)}" 176RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk tk-lib', '', d)}"
177# catch manpage 177# catch manpage
178PACKAGES += "${PN}-man" 178PACKAGES += "${PN}-man"
179FILES_${PN}-man = "${datadir}/man" 179FILES_${PN}-man = "${datadir}/man"