diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2017-08-04 14:14:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-20 22:31:56 +0000 |
commit | 7aaffbede46ce352b91c7a5c5f825a6f3b5b1c2e (patch) | |
tree | 80b839beeb0155bd3680d0e77053905eb22c5854 /meta/recipes-devtools/python | |
parent | 2afde7e7bd866c4d3d059229c3c2201b7096e5e6 (diff) | |
download | poky-7aaffbede46ce352b91c7a5c5f825a6f3b5b1c2e.tar.gz |
python: fix RDEPENDS on several recipes, due to non-existent packages
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>
Diffstat (limited to 'meta/recipes-devtools/python')
8 files changed, 3 insertions, 15 deletions
diff --git a/meta/recipes-devtools/python/python-async.inc b/meta/recipes-devtools/python/python-async.inc index 0874667e0c..6664ab013c 100644 --- a/meta/recipes-devtools/python/python-async.inc +++ b/meta/recipes-devtools/python/python-async.inc | |||
@@ -9,6 +9,6 @@ inherit pypi | |||
9 | SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b" | 9 | SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b" |
10 | SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051" | 10 | SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051" |
11 | 11 | ||
12 | RDEPENDS_${PN} += "${PYTHON_PN}-threading ${PYTHON_PN}-lang" | 12 | RDEPENDS_${PN} += "${PYTHON_PN}-threading" |
13 | 13 | ||
14 | BBCLASSEXTEND = "nativesdk" | 14 | BBCLASSEXTEND = "nativesdk" |
diff --git a/meta/recipes-devtools/python/python-git.inc b/meta/recipes-devtools/python/python-git.inc index bef08eb74e..8d37693960 100644 --- a/meta/recipes-devtools/python/python-git.inc +++ b/meta/recipes-devtools/python/python-git.inc | |||
@@ -17,19 +17,14 @@ SRC_URI[sha256sum] = "ad61bc25deadb535b047684d06f3654c001d9415e1971e51c9c20f5b51 | |||
17 | 17 | ||
18 | DEPENDS = "${PYTHON_PN}-gitdb" | 18 | DEPENDS = "${PYTHON_PN}-gitdb" |
19 | 19 | ||
20 | RDEPENDS_${PN} += "${PYTHON_PN}-argparse \ | 20 | RDEPENDS_${PN} += " \ |
21 | ${PYTHON_PN}-datetime \ | 21 | ${PYTHON_PN}-datetime \ |
22 | ${PYTHON_PN}-enum \ | ||
23 | ${PYTHON_PN}-gitdb \ | 22 | ${PYTHON_PN}-gitdb \ |
24 | ${PYTHON_PN}-io \ | 23 | ${PYTHON_PN}-io \ |
25 | ${PYTHON_PN}-lang \ | ||
26 | ${PYTHON_PN}-logging \ | 24 | ${PYTHON_PN}-logging \ |
27 | ${PYTHON_PN}-math \ | 25 | ${PYTHON_PN}-math \ |
28 | ${PYTHON_PN}-netclient \ | 26 | ${PYTHON_PN}-netclient \ |
29 | ${PYTHON_PN}-re \ | ||
30 | ${PYTHON_PN}-shell \ | ||
31 | ${PYTHON_PN}-stringold \ | 27 | ${PYTHON_PN}-stringold \ |
32 | ${PYTHON_PN}-subprocess \ | ||
33 | ${PYTHON_PN}-unittest \ | 28 | ${PYTHON_PN}-unittest \ |
34 | ${PYTHON_PN}-unixadmin \ | 29 | ${PYTHON_PN}-unixadmin \ |
35 | git \ | 30 | git \ |
diff --git a/meta/recipes-devtools/python/python-gitdb.inc b/meta/recipes-devtools/python/python-gitdb.inc index b32b869a02..2d5292e5d4 100644 --- a/meta/recipes-devtools/python/python-gitdb.inc +++ b/meta/recipes-devtools/python/python-gitdb.inc | |||
@@ -17,7 +17,6 @@ RDEPENDS_${PN} += "${PYTHON_PN}-async \ | |||
17 | ${PYTHON_PN}-compression \ | 17 | ${PYTHON_PN}-compression \ |
18 | ${PYTHON_PN}-crypt \ | 18 | ${PYTHON_PN}-crypt \ |
19 | ${PYTHON_PN}-io \ | 19 | ${PYTHON_PN}-io \ |
20 | ${PYTHON_PN}-lang \ | ||
21 | ${PYTHON_PN}-mmap \ | 20 | ${PYTHON_PN}-mmap \ |
22 | ${PYTHON_PN}-shell \ | 21 | ${PYTHON_PN}-shell \ |
23 | ${PYTHON_PN}-smmap \ | 22 | ${PYTHON_PN}-smmap \ |
diff --git a/meta/recipes-devtools/python/python-scons_3.0.1.bb b/meta/recipes-devtools/python/python-scons_3.0.1.bb index 2f75b08d25..d5084b2d16 100644 --- a/meta/recipes-devtools/python/python-scons_3.0.1.bb +++ b/meta/recipes-devtools/python/python-scons_3.0.1.bb | |||
@@ -18,5 +18,4 @@ RDEPENDS_${PN} = "\ | |||
18 | python-subprocess \ | 18 | python-subprocess \ |
19 | python-shell \ | 19 | python-shell \ |
20 | python-pprint \ | 20 | python-pprint \ |
21 | python-importlib \ | ||
22 | " | 21 | " |
diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index d6eeeba2e3..54b7c300e0 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc | |||
@@ -30,15 +30,12 @@ RDEPENDS_${PN} = "\ | |||
30 | ${PYTHON_PN}-distutils \ | 30 | ${PYTHON_PN}-distutils \ |
31 | ${PYTHON_PN}-email \ | 31 | ${PYTHON_PN}-email \ |
32 | ${PYTHON_PN}-html \ | 32 | ${PYTHON_PN}-html \ |
33 | ${PYTHON_PN}-importlib \ | ||
34 | ${PYTHON_PN}-netserver \ | 33 | ${PYTHON_PN}-netserver \ |
35 | ${PYTHON_PN}-numbers \ | 34 | ${PYTHON_PN}-numbers \ |
36 | ${PYTHON_PN}-pkgutil \ | 35 | ${PYTHON_PN}-pkgutil \ |
37 | ${PYTHON_PN}-plistlib \ | 36 | ${PYTHON_PN}-plistlib \ |
38 | ${PYTHON_PN}-shell \ | 37 | ${PYTHON_PN}-shell \ |
39 | ${PYTHON_PN}-subprocess \ | ||
40 | ${PYTHON_PN}-stringold \ | 38 | ${PYTHON_PN}-stringold \ |
41 | ${PYTHON_PN}-textutils \ | ||
42 | ${PYTHON_PN}-threading \ | 39 | ${PYTHON_PN}-threading \ |
43 | ${PYTHON_PN}-unittest \ | 40 | ${PYTHON_PN}-unittest \ |
44 | ${PYTHON_PN}-xml \ | 41 | ${PYTHON_PN}-xml \ |
diff --git a/meta/recipes-devtools/python/python-smmap.inc b/meta/recipes-devtools/python/python-smmap.inc index 32438350c1..55aa516e0a 100644 --- a/meta/recipes-devtools/python/python-smmap.inc +++ b/meta/recipes-devtools/python/python-smmap.inc | |||
@@ -13,7 +13,6 @@ SRC_URI[md5sum] = "d7932d5ace206bf4ae15198cf36fb6ab" | |||
13 | SRC_URI[sha256sum] = "0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62" | 13 | SRC_URI[sha256sum] = "0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62" |
14 | 14 | ||
15 | RDEPENDS_${PN} += "${PYTHON_PN}-codecs \ | 15 | RDEPENDS_${PN} += "${PYTHON_PN}-codecs \ |
16 | ${PYTHON_PN}-lang \ | ||
17 | ${PYTHON_PN}-mmap \ | 16 | ${PYTHON_PN}-mmap \ |
18 | " | 17 | " |
19 | BBCLASSEXTEND = "nativesdk" | 18 | BBCLASSEXTEND = "nativesdk" |
diff --git a/meta/recipes-devtools/python/python3-pip_9.0.1.bb b/meta/recipes-devtools/python/python3-pip_9.0.1.bb index 4ce13da410..cd849eb08e 100644 --- a/meta/recipes-devtools/python/python3-pip_9.0.1.bb +++ b/meta/recipes-devtools/python/python3-pip_9.0.1.bb | |||
@@ -37,7 +37,6 @@ do_install_append() { | |||
37 | RDEPENDS_${PN} = "\ | 37 | RDEPENDS_${PN} = "\ |
38 | python3-compile \ | 38 | python3-compile \ |
39 | python3-io \ | 39 | python3-io \ |
40 | python3-enum \ | ||
41 | python3-html \ | 40 | python3-html \ |
42 | python3-json \ | 41 | python3-json \ |
43 | python3-netserver \ | 42 | python3-netserver \ |
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.26.1.bb b/meta/recipes-devtools/python/python3-pygobject_3.26.1.bb index 0405b44f17..91f2d53d78 100644 --- a/meta/recipes-devtools/python/python3-pygobject_3.26.1.bb +++ b/meta/recipes-devtools/python/python3-pygobject_3.26.1.bb | |||
@@ -24,7 +24,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wa | |||
24 | # we don't link against python3-pycairo -> RDEPENDS | 24 | # we don't link against python3-pycairo -> RDEPENDS |
25 | PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo python3-pycairo, python3-pycairo" | 25 | PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo python3-pycairo, python3-pycairo" |
26 | 26 | ||
27 | RDEPENDS_${PN} += "python3-setuptools python3-importlib" | 27 | RDEPENDS_${PN} += "python3-setuptools" |
28 | 28 | ||
29 | BBCLASSEXTEND = "native" | 29 | BBCLASSEXTEND = "native" |
30 | PACKAGECONFIG_class-native = "" | 30 | PACKAGECONFIG_class-native = "" |