[OE-core] [OE-Core][PATCH v3] bmap-tools: update from 3.4 to 3.5

[Alex Kiernan]

bmap-tools 3.5 was released August 2018 but has no release tarball, so
switch to using the git fetcher. Also pull in the fix for StopIteration
being transformed into RuntimeError for Python 3.7.

Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
---

Changes in v3:
- Reinstate append of "+git${SRCPV}" to PV
- Add workaround for https://bugzilla.yoctoproject.org/show_bug.cgi?id=10113
  as suggested by Richard Purdie <richard.purdie at linuxfoundation.org>

Changes in v2:
- Drop append of "+git${SRCPV}" to PV

 .../bmap-tools/{bmap-tools_3.4.bb => bmap-tools_3.5.bb} | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
 rename meta/recipes-support/bmap-tools/{bmap-tools_3.4.bb => bmap-tools_3.5.bb} (63%)

diff --git a/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb b/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
similarity index 63%
rename from meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
rename to meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
index 2aae9a3fe0d8..25c1c694817f 100644
--- a/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
+++ b/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
@@ -9,16 +9,23 @@ SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "https://github.com/intel/${BPN}/releases/download/v${PV}/${BP}.tgz"
+SRC_URI = "git://github.com/intel/${BPN}"
 
-SRC_URI[md5sum] = "883420183611aa137cbaf68a91ef0d7e"
-SRC_URI[sha256sum] = "0064891270c180c190f41925b0f6fb9cecac3056f1168d2592dbe90e5f226c0a"
+SRCREV = "db7087b883bf52cbff063ad17a41cc1cbb85104d"
+S = "${WORKDIR}/git"
+PV .= "+git${SRCPV}"
 
-UPSTREAM_CHECK_URI = "https://github.com/intel/${BPN}/releases"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
 
-RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl"
+RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six"
 
 inherit python3native
 inherit setuptools3
 
+# We need the native dependency on python3-six at runtime
+# See bug 10113
+EXTRASYSROOTDEPTASK = ""
+EXTRASYSROOTDEPTASK_class-native = "do_populate_sysroot"
+do_populate_sysroot[rdeptask] = "${EXTRASYSROOTDEPTASK}"
+
 BBCLASSEXTEND = "native"
-- 
2.7.4