diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-26 06:55:05 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 17:22:49 +0300 |
commit | d7bf8c17eca8f8c89898a7794462c773c449e983 (patch) | |
tree | d18618fca85ca5f0c077032cc7b009344b60f663 /import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch | |
parent | e2b5abdc9f28cdf8578e5b9be803c8e697443c20 (diff) | |
download | openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.tar.xz |
Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch')
-rw-r--r-- | import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch | 26 |
1 files changed, 26 insertions, 0 deletions
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 new file mode 100644 index 0000000000..14fb0bb3e5 --- /dev/null +++ b/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch @@ -0,0 +1,26 @@ +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) |