diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted')
-rw-r--r-- | import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc | 13 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted/0001-fix-version-float-check.patch | 26 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb (renamed from import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.10.7.bb) | 4 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch | 26 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb (renamed from import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.10.7.bb) | 2 |
5 files changed, 8 insertions, 63 deletions
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc b/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc index 65f8ca14d..a0ec02817 100644 --- a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc +++ b/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc @@ -6,16 +6,17 @@ HOMEPAGE = "https://github.com/rhinstaller/pyparted" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "\ file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ - file://src/_pedmodule.c;startline=10;endline=22;md5=ebcb25dde1ac9c46e986dec79b404e7e \ + file://src/_pedmodule.c;beginline=10;endline=22;md5=9e53304db812b80d0939e11bb69dcab2 \ " 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) \ +" RDEPENDS_${PN}_class-native = "" diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted/0001-fix-version-float-check.patch b/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted/0001-fix-version-float-check.patch deleted file mode 100644 index db3ab9fc3..000000000 --- a/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.10.7.bb b/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb index 8a15a89fd..7d00fd7d9 100644 --- a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.10.7.bb +++ b/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb @@ -1,12 +1,10 @@ require python-pyparted.inc -DEPENDS += "python-re" - PV = "3.10.7+git${SRCPV}" inherit distutils -RDEPENDS_${PN} += "python-stringold python-codecs python-math" +RDEPENDS_${PN} += "python-stringold python-codecs python-math python-subprocess" RDEPENDS_${PN}_class-native = "" BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch b/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch deleted file mode 100644 index 14fb0bb3e..000000000 --- a/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.10.7.bb b/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb index ff72c2a65..4d6f97b59 100644 --- a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.10.7.bb +++ b/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb @@ -1,7 +1,5 @@ require python-pyparted.inc -DEPENDS += "python3-re" - PV = "3.10.7+git${SRCPV}" inherit distutils3 |