diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-01-28 22:23:19 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-01-30 13:34:49 -0800 |
commit | 69c99033461e769f9a3359d324a1956e5b88dd78 (patch) | |
tree | d15617bcc7b04ded16589e35b83498e79861c289 | |
parent | 9ada8b1306dad1a4675765b6ea54f1eb390c13dc (diff) | |
download | meta-openembedded-69c99033461e769f9a3359d324a1956e5b88dd78.tar.gz |
python-twisted: Remove ${PN}-src
This fixes the QA errors about double defining this in PACKAGES
it seems to be removed in py3 version of recipe too so we just do it in
inc file so both recipes can use it
Fix a typo in specifying rdep
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-python/recipes-devtools/python/python-twisted.inc | 4 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-twisted_18.4.0.bb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/meta-python/recipes-devtools/python/python-twisted.inc b/meta-python/recipes-devtools/python/python-twisted.inc index 01616b168..456adf4c3 100644 --- a/meta-python/recipes-devtools/python/python-twisted.inc +++ b/meta-python/recipes-devtools/python/python-twisted.inc | |||
@@ -35,7 +35,6 @@ PACKAGES += "\ | |||
35 | " | 35 | " |
36 | 36 | ||
37 | PACKAGES =+ "\ | 37 | PACKAGES =+ "\ |
38 | ${PN}-src \ | ||
39 | ${PN}-bin \ | 38 | ${PN}-bin \ |
40 | " | 39 | " |
41 | 40 | ||
@@ -242,9 +241,10 @@ FILES_${PN}-doc += " \ | |||
242 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \ | 241 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \ |
243 | " | 242 | " |
244 | 243 | ||
245 | RDEPENDS_{PN}-src = "${PN}" | 244 | RDEPENDS_${PN}-src = "${PN}" |
246 | FILES_${PN}-src = " \ | 245 | FILES_${PN}-src = " \ |
247 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \ | 246 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \ |
248 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \ | 247 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \ |
249 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \ | 248 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \ |
250 | " | 249 | " |
250 | |||
diff --git a/meta-python/recipes-devtools/python/python3-twisted_18.4.0.bb b/meta-python/recipes-devtools/python/python3-twisted_18.4.0.bb index 6bd8c52eb..dfb9d4a4c 100644 --- a/meta-python/recipes-devtools/python/python3-twisted_18.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-twisted_18.4.0.bb | |||
@@ -1,8 +1,6 @@ | |||
1 | inherit pypi setuptools3 | 1 | inherit pypi setuptools3 |
2 | require python-twisted.inc | 2 | require python-twisted.inc |
3 | 3 | ||
4 | PACKAGES_remove = "${PN}-src" | ||
5 | |||
6 | FILES_${PN}-core_append += " \ | 4 | FILES_${PN}-core_append += " \ |
7 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ | 5 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ |
8 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ | 6 | ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ |