diff options
author | leimaohui <leimaohui@cn.fujitsu.com> | 2018-05-27 17:34:16 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-08-19 07:19:58 -0700 |
commit | 7825bc0ed57c5da0fafd260b5e81346410582e33 (patch) | |
tree | eb685d8d6ea86d717419a2d307ce00c1415c3e01 | |
parent | 4504d2e78d544ef649dede6148675cef3ca500e3 (diff) | |
download | meta-openembedded-7825bc0ed57c5da0fafd260b5e81346410582e33.tar.gz |
python-pytest: Fix conflict error as following:
file /usr/bin/py.test conflicts between attempted installs of python3-pytest-3.4.2-r0 and python-pytest-3.4.2-r0
file /usr/bin/pytest conflicts between attempted installs of python3-pytest-3.4.2-r0 and python-pytest-3.4.2-r0
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 28fab4c8f547d45b80bb7b06d33a6c6c1ea74efc)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
3 files changed, 13 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python-pytest.inc b/meta-python/recipes-devtools/python/python-pytest.inc index 4feb9a03c..4c32dfb04 100644 --- a/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-python/recipes-devtools/python/python-pytest.inc | |||
@@ -9,6 +9,8 @@ SRC_URI[sha256sum] = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad590 | |||
9 | SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ | 9 | SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ |
10 | file://pytest_version_fix.patch " | 10 | file://pytest_version_fix.patch " |
11 | 11 | ||
12 | inherit update-alternatives | ||
13 | |||
12 | RDEPENDS_${PN}_class-target += " \ | 14 | RDEPENDS_${PN}_class-target += " \ |
13 | ${PYTHON_PN}-attrs \ | 15 | ${PYTHON_PN}-attrs \ |
14 | ${PYTHON_PN}-debugger \ | 16 | ${PYTHON_PN}-debugger \ |
@@ -22,4 +24,12 @@ RDEPENDS_${PN}_class-target += " \ | |||
22 | 24 | ||
23 | FILESEXTRAPATHS_prepend := "${THISDIR}/python-pytest:" | 25 | FILESEXTRAPATHS_prepend := "${THISDIR}/python-pytest:" |
24 | 26 | ||
27 | ALTERNATIVE_${PN} += "py.test pytest" | ||
28 | |||
29 | NATIVE_LINK_NAME[pytest] = "${bindir}/pytest" | ||
30 | ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest" | ||
31 | |||
32 | ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test" | ||
33 | ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test" | ||
34 | |||
25 | BBCLASSEXTEND = "native nativesdk" | 35 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb b/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb index 201ab050c..39e50aca9 100644 --- a/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb +++ b/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb | |||
@@ -6,3 +6,4 @@ RDEPENDS_${PN}_class-target += " \ | |||
6 | ${PYTHON_PN}-compiler \ | 6 | ${PYTHON_PN}-compiler \ |
7 | ${PYTHON_PN}-funcsigs \ | 7 | ${PYTHON_PN}-funcsigs \ |
8 | " | 8 | " |
9 | ALTERNATIVE_PRIORITY = "10" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb b/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb index 466cfa825..eba6632a2 100644 --- a/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb +++ b/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb | |||
@@ -1,2 +1,4 @@ | |||
1 | inherit pypi setuptools3 | 1 | inherit pypi setuptools3 |
2 | require python-pytest.inc | 2 | require python-pytest.inc |
3 | |||
4 | ALTERNATIVE_PRIORITY = "100" | ||