* [PATCH 1/3] bmap-tools: upgrade to v3.4
2017-09-06 9:48 [PATCH 0/3] #11891 - Port bmaptools to Python 3 Ed Bartosh
@ 2017-09-06 9:48 ` Ed Bartosh
2017-09-06 10:15 ` Burton, Ross
2017-09-06 9:48 ` [PATCH 2/3] bmap-tools: switch to Python 3 Ed Bartosh
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Ed Bartosh @ 2017-09-06 9:48 UTC (permalink / raw)
To: openembedded-core
Upgraded to the latest upstream release.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
.../bmap-tools/{bmap-tools_3.2.bb => bmap-tools_3.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/bmap-tools/{bmap-tools_3.2.bb => bmap-tools_3.4.bb} (85%)
diff --git a/meta/recipes-support/bmap-tools/bmap-tools_3.2.bb b/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
similarity index 85%
rename from meta/recipes-support/bmap-tools/bmap-tools_3.2.bb
rename to meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
index b8ebe630815..9735707f85b 100644
--- a/meta/recipes-support/bmap-tools/bmap-tools_3.2.bb
+++ b/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/01org/bmap-tools.git"
-SRCREV = "96702a869220ab20830db916ec4ac595e1d97f92"
+SRCREV = "v3.4"
S = "${WORKDIR}/git"
@@ -21,5 +21,5 @@ inherit setuptools
BBCLASSEXTEND = "native"
do_install_append_class-native() {
- sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' ${D}${bindir}/bmaptool
+ sed -i -e 's|^#!.*/usr/bin/python-native/python|#! /usr/bin/env nativepython|' ${D}${bindir}/bmaptool
}
--
2.13.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] bmap-tools: switch to Python 3
2017-09-06 9:48 [PATCH 0/3] #11891 - Port bmaptools to Python 3 Ed Bartosh
2017-09-06 9:48 ` [PATCH 1/3] bmap-tools: upgrade to v3.4 Ed Bartosh
@ 2017-09-06 9:48 ` Ed Bartosh
2017-09-06 9:48 ` [PATCH 3/3] wic: run bmaptool with native Python3 Ed Bartosh
2017-09-06 10:04 ` ✗ patchtest: failure for #11891 - Port bmaptools to Python 3 Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Ed Bartosh @ 2017-09-06 9:48 UTC (permalink / raw)
To: openembedded-core
bmap-tools is the only recipe in oe-core that still uses
Python 2. Switching it to Python 3 should help to get rid of
building native Python 2 and its dependencies.
[YOCTO: #11891]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta/recipes-support/bmap-tools/bmap-tools_3.4.bb | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb b/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
index 9735707f85b..f52fa53b4f3 100644
--- a/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
+++ b/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
@@ -16,10 +16,7 @@ S = "${WORKDIR}/git"
RDEPENDS_${PN} = "python-core python-compression python-mmap"
-inherit setuptools
+inherit python3native
+inherit setuptools3
BBCLASSEXTEND = "native"
-
-do_install_append_class-native() {
- sed -i -e 's|^#!.*/usr/bin/python-native/python|#! /usr/bin/env nativepython|' ${D}${bindir}/bmaptool
-}
--
2.13.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] wic: run bmaptool with native Python3
2017-09-06 9:48 [PATCH 0/3] #11891 - Port bmaptools to Python 3 Ed Bartosh
2017-09-06 9:48 ` [PATCH 1/3] bmap-tools: upgrade to v3.4 Ed Bartosh
2017-09-06 9:48 ` [PATCH 2/3] bmap-tools: switch to Python 3 Ed Bartosh
@ 2017-09-06 9:48 ` Ed Bartosh
2017-09-06 10:04 ` ✗ patchtest: failure for #11891 - Port bmaptools to Python 3 Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Ed Bartosh @ 2017-09-06 9:48 UTC (permalink / raw)
To: openembedded-core
Modified wic code to run bmaptool using native Python3
from wic-tools native sysroot.
[YOCTO: #11891]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/lib/wic/plugins/imager/direct.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 5765bbb527b..a6abc3d09ef 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -213,8 +213,10 @@ class DirectPlugin(ImagerPlugin):
# Generate .bmap
if self.bmap:
logger.debug("Generating bmap file for %s", disk_name)
- exec_native_cmd("bmaptool create %s -o %s.bmap" % (full_path, full_path),
- self.native_sysroot)
+ python = os.path.join(self.native_sysroot, 'usr/bin/python3-native/python3')
+ bmaptool = os.path.join(self.native_sysroot, 'usr/bin/bmaptool')
+ exec_native_cmd("%s %s create %s -o %s.bmap" % \
+ (python, bmaptool, full_path, full_path), self.native_sysroot)
# Compress the image
if self.compressor:
logger.debug("Compressing disk %s with %s", disk_name, self.compressor)
--
2.13.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✗ patchtest: failure for #11891 - Port bmaptools to Python 3
2017-09-06 9:48 [PATCH 0/3] #11891 - Port bmaptools to Python 3 Ed Bartosh
` (2 preceding siblings ...)
2017-09-06 9:48 ` [PATCH 3/3] wic: run bmaptool with native Python3 Ed Bartosh
@ 2017-09-06 10:04 ` Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-09-06 10:04 UTC (permalink / raw)
To: Ed Bartosh; +Cc: openembedded-core
== Series Details ==
Series: #11891 - Port bmaptools to Python 3
Revision: 1
URL : https://patchwork.openembedded.org/series/8732/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Patch [2/3] bmap-tools: switch to Python 3
Issue Yocto Project bugzilla tag is not correctly formatted [test_bugzilla_entry_format]
Suggested fix Specify bugzilla ID in commit description with format: "[YOCTO #<bugzilla ID>]"
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 6+ messages in thread