[meta-python][morty][PATCH 0/2] python-setuptools-scm backports

[meta-python][morty][PATCH 0/2] python-setuptools-scm backports

[Peter Kolbus]

A couple of clean cherrypicks from rocko- my goal with this series is
support for -native. Picking the version bump simply avoids a merge
conflict; if this is not allowed, I'm happy to rework.

[meta-python][morty][PATCH 1/2] python-setuptools-scm: update to version 1.15.0

[Peter Kolbus]

From: Derek Straka <derek@asterius.io>

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

(cherry picked from commit cdbc7cdc285d0f5ee68569ee03f695ec4529125f)

Signed-off-by: Peter Kolbus <peter.kolbus@garmin.com>
---
 .../python/python-setuptools-scm_1.11.1.bb     | 18 ------------------
 .../python/python-setuptools-scm_1.15.0.bb     | 13 +++++++++++++
 2 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-setuptools-scm_1.11.1.bb
 create mode 100644 meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb

diff --git a/meta-python/recipes-devtools/python/python-setuptools-scm_1.11.1.bb b/meta-python/recipes-devtools/python/python-setuptools-scm_1.11.1.bb
deleted file mode 100644
index 2a3b97d83..000000000
--- a/meta-python/recipes-devtools/python/python-setuptools-scm_1.11.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "the blessed package to manage your versions by scm tags"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2"
-
-inherit pypi setuptools
-
-SRCNAME = "setuptools_scm"
-
-SRC_URI = "https://pypi.python.org/packages/84/aa/c693b5d41da513fed3f0ee27f1bf02a303caa75bbdfa5c8cc233a1d778c4/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "4d19b2bc9580016d991f665ac20e2e8f"
-SRC_URI[sha256sum] = "8c45f738a23410c5276b0ed9294af607f491e4260589f1eb90df8312e23819bf"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-RDEPENDS_${PN} = "python-py python-setuptools python-argparse python-debugger python-json"
-
-
diff --git a/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb b/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
new file mode 100644
index 000000000..45204c98c
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
@@ -0,0 +1,13 @@
+SUMMARY = "the blessed package to manage your versions by scm tags"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2"
+
+SRC_URI[md5sum] = "b6916c78ed6253d6602444fad4279c5b"
+SRC_URI[sha256sum] = "daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f"
+
+PYPI_PACKAGE = "setuptools_scm"
+inherit pypi setuptools
+
+RDEPENDS_${PN} = "python-py python-setuptools python-argparse python-debugger python-json"
+
+
-- 
2.23.0

[meta-python][morty][PATCH 2/2] python-setuptools-scm: add native to BBCLASSEXTEND

[Peter Kolbus]

From: Daniela Plascencia <daniela.plascencia@linux.intel.com>

Enables a native variant of python-setuptools-scm
by adding BBCLASSEXTEND to the recipe.

Signed-off-by: Daniela Plascencia <daniela.plascencia@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

(cherry picked from commit 3aac48c722fa836e04e95a495d758b8ee0d0cdda)

Signed-off-by: Peter Kolbus <peter.kolbus@garmin.com>
---
 .../recipes-devtools/python/python-setuptools-scm_1.15.0.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb b/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
index 45204c98c..afbc83ea9 100644
--- a/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
+++ b/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
@@ -6,8 +6,10 @@ SRC_URI[md5sum] = "b6916c78ed6253d6602444fad4279c5b"
 SRC_URI[sha256sum] = "daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f"
 
 PYPI_PACKAGE = "setuptools_scm"
-inherit pypi setuptools
 
-RDEPENDS_${PN} = "python-py python-setuptools python-argparse python-debugger python-json"
+RDEPENDS_${PN}_class-target = "python-py python-setuptools python-argparse python-debugger python-json"
+RDEPENDS_${PN}_class-native = "python-setuptools-native"
 
+BBCLASSEXTEND =+ "native"
 
+inherit pypi setuptools
-- 
2.23.0