diff options
author | Qi.Chen@windriver.com <Qi.Chen@windriver.com> | 2018-09-14 09:51:44 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-14 19:01:41 -0700 |
commit | 892948980c153ff21f7863115b4a51c8f0f194d2 (patch) | |
tree | 129e424e2fbcf86affc0396d2b5c65c391ad5c3f | |
parent | 8baaf208809ed9995f200c59866bcf123938a8a9 (diff) | |
download | meta-openembedded-892948980c153ff21f7863115b4a51c8f0f194d2.tar.gz |
python(3)-ndg-httpsclient: use update-alternatives to avoid do_rootfs failure
Use update-alternaives to manage /usr/bin/ndg_httpclient to avoid the following
do_rootfs failure.
Error: Transaction check error:
file /usr/bin/ndg_httpclient conflicts between attempted installs of python-ndg-httpsclient-0.5.1-r0.core2_64 and python3-ndg-httpsclient-0.5.1-r0.core2_64
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb | 6 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb b/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb index ca0eb3263..9cd881a3e 100644 --- a/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb +++ b/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb | |||
@@ -1,2 +1,6 @@ | |||
1 | require python-ndg-httpsclient.inc | 1 | require python-ndg-httpsclient.inc |
2 | inherit pypi setuptools | 2 | inherit pypi setuptools update-alternatives |
3 | |||
4 | ALTERNATIVE_${PN} = "ndg_httpclient" | ||
5 | ALTERNATIVE_LINK_NAME[ndg_httpclient] = "${bindir}/ndg_httpclient" | ||
6 | ALTERNATIVE_PRIORITY = "20" | ||
diff --git a/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb b/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb index 3f07b2ed2..65a8c816f 100644 --- a/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb +++ b/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb | |||
@@ -1,2 +1,6 @@ | |||
1 | inherit pypi setuptools3 | 1 | inherit pypi setuptools3 update-alternatives |
2 | require python-ndg-httpsclient.inc | 2 | require python-ndg-httpsclient.inc |
3 | |||
4 | ALTERNATIVE_${PN} = "ndg_httpclient" | ||
5 | ALTERNATIVE_LINK_NAME[ndg_httpclient] = "${bindir}/ndg_httpclient" | ||
6 | ALTERNATIVE_PRIORITY = "30" | ||