[yocto][meta-openembedded][master][warrior][PATCH 0/2] python-pywbem: solved the conflict with python3-pywbem

[yocto][meta-openembedded][master][warrior][PATCH 0/2] python-pywbem: solved the conflict with python3-pywbem

[Zang Ruochen]

-Use the update-alternatives class to resolve conflicts.

Zang Ruochen (2):
  [yocto][meta-openembedded][master][warrior][PATCH 1/2] python-pywbem: solved the
    conflict with python3-pywbem
  [yocto][meta-openembedded][master][warrior][PATCH 2/2] python3-pywbem:solved the
    conflict with python-pywbem

 .../recipes-extended/pywbem/python-pywbem_0.11.0.bb      | 9 ++++++++-
 .../recipes-extended/pywbem/python3-pywbem_0.11.0.bb     | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

-- 
2.20.1

[yocto][meta-openembedded][master][warrior][PATCH 1/2] python-pywbem: solved the conflict with python3-pywbem

[Zang Ruochen]

-Use update-alternatives class to resolve conflicts with python3-pywbem.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../recipes-extended/pywbem/python-pywbem_0.11.0.bb      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb b/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb
index 741074907..a699f1c7e 100644
--- a/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb
+++ b/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb
@@ -1,5 +1,5 @@
 require python-pywbem.inc
-inherit setuptools
+inherit setuptools update-alternatives
 
 DEPENDS += " \
     ${PYTHON_PN}-m2crypto-native \
@@ -11,3 +11,10 @@ RDEPENDS_${PN}_class-target += "\
     ${PYTHON_PN}-m2crypto \
     ${PYTHON_PN}-subprocess \
 "
+
+ALTERNATIVE_${PN} = "mof_compiler pywbemcli wbemcli"
+ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler"
+ALTERNATIVE_TARGET[pywbemcli] = "${bindir}/pywbemcli"
+ALTERNATIVE_TARGET[wbemcli] = "${bindir}/wbemcli"
+
+ALTERNATIVE_PRIORITY = "30"
-- 
2.20.1

[yocto][meta-openembedded][master][warrior][PATCH 2/2] python3-pywbem:solved the conflict with python-pywbem

[Zang Ruochen]

-Use update-alternatives class to resolve conflicts with python-pywbem.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../recipes-extended/pywbem/python3-pywbem_0.11.0.bb     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb b/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb
index 6a35a8744..abfb8d920 100644
--- a/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb
+++ b/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb
@@ -1,2 +1,9 @@
 require python-pywbem.inc
-inherit setuptools3
+inherit setuptools3 update-alternatives
+
+ALTERNATIVE_${PN} = "mof_compiler pywbemcli wbemcli"
+ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler"
+ALTERNATIVE_TARGET[pywbemcli] = "${bindir}/pywbemcli"
+ALTERNATIVE_TARGET[wbemcli] = "${bindir}/wbemcli"
+
+ALTERNATIVE_PRIORITY = "60"
-- 
2.20.1