CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

python: fix RDEPENDS on several recipes, due to non-existent packages

Browse Source 
The packaging has been altered slightly so ensure the dependencies are all still
valid.

(From OE-Core rev: 3328211afdef8ffb00dd4dff1143959d5412b075)

Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alejandro Hernandez 2017-08-04 14:14:02 -07:00 committed by Richard Purdie
parent 2afde7e7bd
commit 7aaffbede4
18 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-core/libxml/libxml2_2.9.7.bb
View File

@ -40,7 +40,7 @@ inherit autotools pkgconfig binconfig-disabled ptest
inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)}
RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-argparse python3-logging python3-shell python3-signal python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}"
RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}"
RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}"

2
meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
View File

@ -139,7 +139,7 @@ do_install () {
PACKAGES =+ "pybootchartgui"
FILES_pybootchartgui += "${PYTHON_SITEPACKAGES_DIR}/pybootchartgui ${bindir}/pybootchartgui"
RDEPENDS_pybootchartgui = "python3-pycairo python3-compression python3-image python3-textutils python3-shell python3-compression python3-codecs"
RDEPENDS_pybootchartgui = "python3-pycairo python3-compression python3-image python3-shell python3-compression python3-codecs"
RDEPENDS_${PN}_class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}"
RDEPENDS_${PN}_class-target += "lsb"
DEPENDS_append_class-native = " python3-pycairo-native"

26
meta/recipes-devtools/dnf/dnf_2.7.5.bb
View File

@ -25,8 +25,30 @@ DEPENDS += "libdnf librepo libcomps python3-iniparse"
EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3"
BBCLASSEXTEND = "native nativesdk"
RDEPENDS_${PN}_class-target += "python3-core python3-codecs python3-netclient python3-email python3-threading python3-distutils librepo python3-shell python3-subprocess libcomps libdnf python3-sqlite3 python3-compression python3-rpm python3-iniparse python3-json python3-importlib python3-curses python3-argparse python3-misc python3-gpg"
# Recommend gnupg so that GPG signature check on repository metadata is possible
RDEPENDS_${PN}_class-target += " \
python3-core \
python3-codecs \
python3-netclient \
python3-email \
python3-threading \
python3-distutils \
python3-logging \
python3-fcntl \
librepo \
python3-shell \
libcomps \
libdnf \
python3-sqlite3 \
python3-compression \
python3-rpm \
python3-iniparse \
python3-json \
python3-curses \
python3-misc \
python3-gpg \
"
RRECOMMENDS_${PN}_class-target += "gnupg"
# Create a symlink called 'dnf' as 'make install' does not do it, but

4
meta/recipes-devtools/gdb/gdb-cross-canadian.inc
View File

@ -13,9 +13,9 @@ GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
# Overrides PACKAGECONFIG variables in gdb-common.inc
PACKAGECONFIG ??= "python readline"
PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \
nativesdk-python3-core nativesdk-python3-lang nativesdk-python3-re \
nativesdk-python3-core \
nativesdk-python3-codecs nativesdk-python3-netclient \
nativesdk-python3-importlib"
"
PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline"
SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"

2
meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
View File

@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "7f4b08912e26a3f4f6f423f3b4e7157a73b1f3a7483fc59b216d1a80b5
TARGET_CC_ARCH += "${LDFLAGS}"
# For native builds we use the host Python
PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-subprocess python3-pickle python3-compression python3-textutils python3-stringold"
PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-pickle python3-compression python3-stringold"
PYTHONRDEPS_class-native = ""
PACKAGECONFIG = "python update-alternatives"

2
meta/recipes-devtools/python-numpy/python3-numpy_1.13.3.bb
View File

@ -102,11 +102,9 @@ RDEPENDS_${PN} = "python3-unittest \
python3-pydoc \
python3-pkgutil \
python3-email \
python3-subprocess \
python3-compression \
python3-ctypes \
python3-threading \
python3-textutils \
"
RDEPENDS_${PN}_class-native = ""

2
meta/recipes-devtools/python/python-async.inc
View File

@ -9,6 +9,6 @@ inherit pypi
SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b"
SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051"
RDEPENDS_${PN} += "${PYTHON_PN}-threading ${PYTHON_PN}-lang"
RDEPENDS_${PN} += "${PYTHON_PN}-threading"
BBCLASSEXTEND = "nativesdk"

7
meta/recipes-devtools/python/python-git.inc
View File

@ -17,19 +17,14 @@ SRC_URI[sha256sum] = "ad61bc25deadb535b047684d06f3654c001d9415e1971e51c9c20f5b51
DEPENDS = "${PYTHON_PN}-gitdb"
RDEPENDS_${PN} += "${PYTHON_PN}-argparse \
RDEPENDS_${PN} += " \
${PYTHON_PN}-datetime \
${PYTHON_PN}-enum \
${PYTHON_PN}-gitdb \
${PYTHON_PN}-io \
${PYTHON_PN}-lang \
${PYTHON_PN}-logging \
${PYTHON_PN}-math \
${PYTHON_PN}-netclient \
${PYTHON_PN}-re \
${PYTHON_PN}-shell \
${PYTHON_PN}-stringold \
${PYTHON_PN}-subprocess \
${PYTHON_PN}-unittest \
${PYTHON_PN}-unixadmin \
git \

1
meta/recipes-devtools/python/python-gitdb.inc
View File

@ -17,7 +17,6 @@ RDEPENDS_${PN} += "${PYTHON_PN}-async \
${PYTHON_PN}-compression \
${PYTHON_PN}-crypt \
${PYTHON_PN}-io \
${PYTHON_PN}-lang \
${PYTHON_PN}-mmap \
${PYTHON_PN}-shell \
${PYTHON_PN}-smmap \

1
meta/recipes-devtools/python/python-scons_3.0.1.bb
View File

@ -18,5 +18,4 @@ RDEPENDS_${PN} = "\
python-subprocess \
python-shell \
python-pprint \
python-importlib \
"

3
meta/recipes-devtools/python/python-setuptools.inc
View File

@ -30,15 +30,12 @@ RDEPENDS_${PN} = "\
${PYTHON_PN}-distutils \
${PYTHON_PN}-email \
${PYTHON_PN}-html \
${PYTHON_PN}-importlib \
${PYTHON_PN}-netserver \
${PYTHON_PN}-numbers \
${PYTHON_PN}-pkgutil \
${PYTHON_PN}-plistlib \
${PYTHON_PN}-shell \
${PYTHON_PN}-subprocess \
${PYTHON_PN}-stringold \
${PYTHON_PN}-textutils \
${PYTHON_PN}-threading \
${PYTHON_PN}-unittest \
${PYTHON_PN}-xml \

1
meta/recipes-devtools/python/python-smmap.inc
View File

@ -13,7 +13,6 @@ SRC_URI[md5sum] = "d7932d5ace206bf4ae15198cf36fb6ab"
SRC_URI[sha256sum] = "0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62"
RDEPENDS_${PN} += "${PYTHON_PN}-codecs \
${PYTHON_PN}-lang \
${PYTHON_PN}-mmap \
"
BBCLASSEXTEND = "nativesdk"

1
meta/recipes-devtools/python/python3-pip_9.0.1.bb
View File

@ -37,7 +37,6 @@ do_install_append() {
RDEPENDS_${PN} = "\
python3-compile \
python3-io \
python3-enum \
python3-html \
python3-json \
python3-netserver \

2
meta/recipes-devtools/python/python3-pygobject_3.26.1.bb
View File

@ -24,7 +24,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wa
# we don't link against python3-pycairo -> RDEPENDS
PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo python3-pycairo, python3-pycairo"
RDEPENDS_${PN} += "python3-setuptools python3-importlib"
RDEPENDS_${PN} += "python3-setuptools"
BBCLASSEXTEND = "native"
PACKAGECONFIG_class-native = ""

2
meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
View File

@ -1,6 +1,6 @@
SUMMARY = "Qemu helper scripts"
LICENSE = "GPLv2"
RDEPENDS_${PN} = "nativesdk-qemu nativesdk-python3-subprocess \
RDEPENDS_${PN} = "nativesdk-qemu \
nativesdk-python3-shell nativesdk-python3-fcntl \
"

4
meta/recipes-graphics/piglit/piglit_git.bb
View File

@ -44,9 +44,9 @@ do_configure_prepend() {
OECMAKE_TARGET_INSTALL = "install/strip"
RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \
python3-subprocess python3-misc python3-importlib \
python3-misc \
python3-unixadmin python3-xml python3-multiprocessing \
python3-six python3-shell python3-io python3-argparse \
python3-six python3-shell python3-io \
python3-netserver mesa-demos bash \
"

2
meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb
View File

@ -22,5 +22,5 @@ do_install() {
}
FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py"
RDEPENDS_${PN} = "python3 python3-subprocess python3-textutils"
RDEPENDS_${PN} = "python3-core "
RRECOMMENDS_${PN} = "kernel-module-hwlat-detector"

2
meta/recipes-rt/rt-tests/rt-tests_1.1.bb
View File

@ -26,6 +26,6 @@ do_install_ptest() {
cp ${WORKDIR}/rt_bmark.py ${D}${PTEST_PATH}
}
RDEPENDS_${PN}-ptest += " stress python3 python3-subprocess python3-multiprocessing python3-datetime python3-re python3-lang python3-misc"
RDEPENDS_${PN}-ptest += " stress python3 python3-multiprocessing python3-datetime python3-misc"
FILES_${PN} += "${prefix}/src/backfire"