]> code.ossystems Code Review - openembedded-core.git/commitdiff
python3: fix RDEPENDS on several recipes, due to non-existent python3 packages
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>
Fri, 4 Aug 2017 21:14:02 +0000 (14:14 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 14 Sep 2017 13:07:53 +0000 (14:07 +0100)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
17 files changed:
meta/recipes-core/libxml/libxml2_2.9.4.bb
meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
meta/recipes-devtools/dnf/dnf_2.6.3.bb
meta/recipes-devtools/gdb/gdb-cross-canadian.inc
meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb
meta/recipes-devtools/python/python3-async_0.6.2.bb
meta/recipes-devtools/python/python3-git_2.1.5.bb
meta/recipes-devtools/python/python3-gitdb_0.6.4.bb
meta/recipes-devtools/python/python3-pip_9.0.1.bb
meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
meta/recipes-devtools/python/python3-smmap_0.9.0.bb
meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
meta/recipes-graphics/piglit/piglit_git.bb
meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb
meta/recipes-rt/rt-tests/rt-tests_1.1.bb

index 107539b50d4915549e200709e147f1bc199e1777..e9e5947d3d38187a8f48028e78f92a57abfadbce 100644 (file)
@@ -49,7 +49,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)}"
 
index a3101351ee7c063ebe42c0eb80435262a8403a96..c047be1e85be08c4c863cad39fee6053a26a6de6 100644 (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"
index 3ed6a74570faed0ee03ec2d015f70fc79287a2c8..39d9b92f6ec8dfcea713eba0f3dc9a2f617a546a 100644 (file)
@@ -26,8 +26,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
index 3ff1989538827eb2ffd311c180f16ebb7b569bb4..4fc6747d9da38e5091baf002ce609369c1485e0e 100644 (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"
index 646cc8ff9a89a4478ce5b157dbc2c7d37d2c6ac0..d14d89ff8732f1b173e5f9df78b27f13409b0cca 100644 (file)
@@ -18,7 +18,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"
index 29874b88423d63ed274cb8eaef5c87f1ea7cd7ef..a5c850ca25cc1d63db569a48edb89ccef3cd067f 100644 (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 = ""
index 54a30f5498eb438e8b6b9e8583286153e1d10317..f45781c44f838e8eda85ae772dfcae7530a9d8ac 100644 (file)
@@ -2,5 +2,5 @@ require python-async.inc
 
 inherit setuptools3
 
-RDEPENDS_${PN} += "python3-threading python3-lang"
+RDEPENDS_${PN} += "python3-threading"
 
index 4ac2a0ec799d82bfbbbc89ddfc52aaf2d2a89554..ca42688f97e8fb00f365effd14640af857d50fc1 100644 (file)
@@ -4,4 +4,4 @@ DEPENDS = "python3-gitdb"
 
 inherit setuptools3
 
-RDEPENDS_${PN} += "python3-gitdb python3-lang python3-io python3-shell python3-math python3-re python3-subprocess python3-stringold python3-unixadmin python3-enum python3-logging python3-datetime python3-netclient python3-unittest python3-argparse git"
+RDEPENDS_${PN} += "python3-gitdb python3-io python3-shell python3-math python3-stringold python3-unixadmin python3-logging python3-datetime python3-netclient python3-unittest git"
index 80d9d469affa32934a63e5084578f587f9e2ac5f..a209c52f9ee4916f665c2aa91e70e1adf86dc147 100644 (file)
@@ -4,4 +4,4 @@ DEPENDS = "python3-async python3-smmap"
 
 inherit distutils3
 
-RDEPENDS_${PN} += "python3-smmap python3-async python3-mmap python3-lang python3-io python3-shell python3-crypt python3-compression"
+RDEPENDS_${PN} += "python3-smmap python3-async python3-mmap python3-io python3-shell python3-crypt python3-compression"
index 9b907a263192326c7756658c6c163c0c6bf89c96..a6dd72df3b159038d1b59541b09f3c22f5d11703 100644 (file)
@@ -44,7 +44,6 @@ do_install_append() {
 RDEPENDS_${PN} = "\
   python3-compile \
   python3-io \
-  python3-enum \
   python3-html \
   python3-json \
   python3-netserver \
index 9d10af2e08622eb5a3534e104eace0f50431a6e5..f4efb14bd2890b84a34813d8b45009d866373fd5 100644 (file)
@@ -26,7 +26,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 = ""
index 63f241809e00e5184197fa42df019bb29009f0db..dab8ad89b016cfbe2c4b88ae60dd77717dcb5d04 100644 (file)
@@ -23,12 +23,9 @@ RDEPENDS_${PN} = "\
   python3-ctypes \
   python3-distutils \
   python3-email \
-  python3-importlib \
   python3-numbers \
   python3-compression \
   python3-shell \
-  python3-subprocess \
-  python3-textutils \
   python3-pkgutil \
   python3-threading \
   python3-misc \
index 9f8a26d79ed512b0405bd6bd3d48ce31b1c056c7..1df74c172c4e72861dc77a098531dd03d8e68e1c 100644 (file)
@@ -2,4 +2,4 @@ require python-smmap.inc
 
 inherit setuptools3
 
-RDEPENDS_${PN} += "python3-codecs python3-mmap python3-lang"
+RDEPENDS_${PN} += "python3-codecs python3-mmap"
index 943ca5f89dc4605593317c0ed8bf422b6409bdd5..1a9ad5cc2b91c1bc52bc50c6641265c0e05dc5d5 100644 (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 \
                 "
 
index d274a8fbd56e2210ddf9ea430dbed3922f94d772..f7726f357738d3a4c0805f858f892c1316d68784 100644 (file)
@@ -45,9 +45,9 @@ do_install() {
 }
 
 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 \
        "
 
index 012b2dd0a7db1dc4d70f280da1814d7d4699fbdc..60b44a4d2583b4291607405315df3a3fb562e370 100644 (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 "
 RRECOMMENDS_${PN} = "kernel-module-hwlat-detector"
index 4336c50d6313c6613bdcf6a36dbe269f55ba294b..496f04fdbaeed08dcb4ac3f619ad03effc07b694 100644 (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"