From 681bce86e589072dcca1b79233c657a6f856a5a1 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Tue, 26 Dec 2017 10:33:55 -0500 Subject: python-parted: update to version 3.11.1 Update github hash for the release Add correct RDEPENDS for the minimal python installs Remove a patch no longer required Signed-off-by: Derek Straka Signed-off-by: Armin Kuster --- .../python-pyparted/python-pyparted.inc | 12 +++++----- .../0001-fix-version-float-check.patch | 26 ---------------------- .../python-pyparted/python-pyparted_3.10.7.bb | 10 --------- .../python-pyparted/python-pyparted_3.11.1.bb | 10 +++++++++ .../0001-fix-version-float-check.patch | 26 ---------------------- .../python-pyparted/python3-pyparted_3.10.7.bb | 10 --------- .../python-pyparted/python3-pyparted_3.11.1.bb | 10 +++++++++ 7 files changed, 27 insertions(+), 77 deletions(-) delete mode 100644 meta-python/recipes-extended/python-pyparted/python-pyparted/0001-fix-version-float-check.patch delete mode 100644 meta-python/recipes-extended/python-pyparted/python-pyparted_3.10.7.bb create mode 100644 meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb delete mode 100644 meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch delete mode 100644 meta-python/recipes-extended/python-pyparted/python3-pyparted_3.10.7.bb create mode 100644 meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb diff --git a/meta-python/recipes-extended/python-pyparted/python-pyparted.inc b/meta-python/recipes-extended/python-pyparted/python-pyparted.inc index 65f8ca14db..2192179be5 100644 --- a/meta-python/recipes-extended/python-pyparted/python-pyparted.inc +++ b/meta-python/recipes-extended/python-pyparted/python-pyparted.inc @@ -11,11 +11,13 @@ LIC_FILES_CHKSUM = "\ DEPENDS += "parted" # upstream only publishes releases in github archives which are discouraged -SRCREV = "69c4a478e43d3eff6ae3a0116fa38da06776d5f5" -SRC_URI = "git://github.com/rhinstaller/pyparted.git;protocol=https \ - file://0001-fix-version-float-check.patch \ -" +SRCREV = "1fdb15120f35f5da1dc7ec116522f0c796a8376a" +SRC_URI = "git://github.com/rhinstaller/pyparted.git;protocol=https" + S = "${WORKDIR}/git" -RDEPENDS_${PN} += "parted (>= 2.3)" +RDEPENDS_${PN}_class-target += " \ + parted (>= 2.3) \ + ${PYTHON_PN}-subprocess \ +" RDEPENDS_${PN}_class-native = "" diff --git a/meta-python/recipes-extended/python-pyparted/python-pyparted/0001-fix-version-float-check.patch b/meta-python/recipes-extended/python-pyparted/python-pyparted/0001-fix-version-float-check.patch deleted file mode 100644 index db3ab9fc3e..0000000000 --- a/meta-python/recipes-extended/python-pyparted/python-pyparted/0001-fix-version-float-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -check_mod_version breaks if module version is of x.y.z form -use a regex to help cast x.y.z version to a float - -Upstream-Status: Pending - -Index: git/setup.py -=================================================================== ---- git.orig/setup.py -+++ git/setup.py -@@ -25,6 +25,7 @@ import glob - import os - import platform - import sys -+import re - from distutils.ccompiler import new_compiler - from distutils.errors import CompileError - from distutils.errors import LinkError -@@ -51,6 +52,8 @@ def pkgconfig(*packages, **kwargs): - - def check_mod_version(module, version): - modversion = subprocess.check_output(["pkg-config", "--modversion", module]) -+ match = re.search('([0-9]+\.[0-9]+)', modversion) -+ modversion = match.group(0) - if not float(modversion) >= float(version): - sys.stderr.write("*** Minimum required %s version: %s, found: %s\n" % (module, version, modversion,)) - sys.exit(1) diff --git a/meta-python/recipes-extended/python-pyparted/python-pyparted_3.10.7.bb b/meta-python/recipes-extended/python-pyparted/python-pyparted_3.10.7.bb deleted file mode 100644 index 81d61c62a3..0000000000 --- a/meta-python/recipes-extended/python-pyparted/python-pyparted_3.10.7.bb +++ /dev/null @@ -1,10 +0,0 @@ -require python-pyparted.inc - -PV = "3.10.7+git${SRCPV}" - -inherit distutils - -RDEPENDS_${PN} += "python-stringold python-codecs python-math" -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb b/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb new file mode 100644 index 0000000000..81d61c62a3 --- /dev/null +++ b/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb @@ -0,0 +1,10 @@ +require python-pyparted.inc + +PV = "3.10.7+git${SRCPV}" + +inherit distutils + +RDEPENDS_${PN} += "python-stringold python-codecs python-math" +RDEPENDS_${PN}_class-native = "" + +BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch b/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch deleted file mode 100644 index 14fb0bb3e5..0000000000 --- a/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -check_mod_version breaks if module version is of x.y.z form -use a regex to help cast x.y.z version to a float - -Upstream-Status: Pending - -Index: git/setup.py -=================================================================== ---- git.orig/setup.py -+++ git/setup.py -@@ -25,6 +25,7 @@ import glob - import os - import platform - import sys -+import re - from distutils.ccompiler import new_compiler - from distutils.errors import CompileError - from distutils.errors import LinkError -@@ -51,6 +52,8 @@ def pkgconfig(*packages, **kwargs): - - def check_mod_version(module, version): - modversion = subprocess.check_output(["pkg-config", "--modversion", module]) -+ match = re.search(b'([0-9]+\.[0-9]+)', modversion) -+ modversion = match.group(0) - if not float(modversion) >= float(version): - sys.stderr.write("*** Minimum required %s version: %s, found: %s\n" % (module, version, modversion,)) - sys.exit(1) diff --git a/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.10.7.bb b/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.10.7.bb deleted file mode 100644 index 4d6f97b59e..0000000000 --- a/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.10.7.bb +++ /dev/null @@ -1,10 +0,0 @@ -require python-pyparted.inc - -PV = "3.10.7+git${SRCPV}" - -inherit distutils3 - -RDEPENDS_${PN} += "python3-stringold python3-codecs python3-math" -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb b/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb new file mode 100644 index 0000000000..4d6f97b59e --- /dev/null +++ b/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb @@ -0,0 +1,10 @@ +require python-pyparted.inc + +PV = "3.10.7+git${SRCPV}" + +inherit distutils3 + +RDEPENDS_${PN} += "python3-stringold python3-codecs python3-math" +RDEPENDS_${PN}_class-native = "" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg