<div dir="ltr"><div>This also needs a maintainers.inc entry.</div><div><br></div><div>Alex<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, 9 Jan 2020 at 21:26, Andreas Müller &lt;<a href="mailto:schnitzeltony@gmail.com">schnitzeltony@gmail.com</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Recent versions of shared-mime-info depend on itstool<br>
<br>
Signed-off-by: Andreas Müller &lt;<a href="mailto:schnitzeltony@gmail.com" target="_blank">schnitzeltony@gmail.com</a>&gt;<br>
---<br>
 ...-build-time-hardcoded-python-binary-.patch | 35 +++++++++++++++++++<br>
 ...ld-time-hardcoded-python-binary-path.patch | 29 +++++++++++++++<br>
 meta/recipes-support/itstool/<a href="http://itstool_2.0.6.bb" rel="noreferrer" target="_blank">itstool_2.0.6.bb</a> | 20 +++++++++++<br>
 3 files changed, 84 insertions(+)<br>
 create mode 100644 meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch<br>
 create mode 100644 meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch<br>
 create mode 100644 meta/recipes-support/itstool/<a href="http://itstool_2.0.6.bb" rel="noreferrer" target="_blank">itstool_2.0.6.bb</a><br>
<br>
diff --git a/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch b/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch<br>
new file mode 100644<br>
index 0000000000..19a858bd75<br>
--- /dev/null<br>
+++ b/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch<br>
@@ -0,0 +1,35 @@<br>
+From 335ef14fc801c9dfbe7e5692dc71cfbe72049d2b Mon Sep 17 00:00:00 2001<br>
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= &lt;<a href="mailto:schnitzeltony@gmail.com" target="_blank">schnitzeltony@gmail.com</a>&gt;<br>
+Date: Sun, 27 Oct 2019 16:38:52 +0100<br>
+Subject: [PATCH] Native: Don&#39;t use build time hardcoded python binary path.<br>
+MIME-Version: 1.0<br>
+Content-Type: text/plain; charset=UTF-8<br>
+Content-Transfer-Encoding: 8bit<br>
+<br>
+This is same patch as used for target build except that we do not use the<br>
+&#39;-S&#39; and &#39;-s&#39; option because &#39;-S&#39; is relatively young [1] and elder build-host<br>
+don&#39;t support it [2]<br>
+<br>
+[1] <a href="https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30" rel="noreferrer" target="_blank">https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30</a><br>
+[2] <a href="https://errors.yoctoproject.org/Errors/Details/274743/" rel="noreferrer" target="_blank">https://errors.yoctoproject.org/Errors/Details/274743/</a><br>
+<br>
+Upstream-Status: Inappropriate [OE specific]<br>
+<br>
+Signed-off-by: Andreas Müller &lt;<a href="mailto:schnitzeltony@gmail.com" target="_blank">schnitzeltony@gmail.com</a>&gt;<br>
+---<br>
+ <a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a> | 2 +-<br>
+ 1 file changed, 1 insertion(+), 1 deletion(-)<br>
+<br>
+diff --git a/<a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a> b/<a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a><br>
+index e64cd34..05d264f 100755<br>
+--- a/<a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a><br>
++++ b/<a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#!@PYTHON@ -s<br>
++#!/usr/bin/env python3<br>
+ #<br>
+ # Copyright (c) 2010-2018 Shaun McCance &lt;<a href="mailto:shaunm@gnome.org" target="_blank">shaunm@gnome.org</a>&gt;<br>
+ #<br>
+-- <br>
+2.21.0<br>
+<br>
diff --git a/meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch b/meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch<br>
new file mode 100644<br>
index 0000000000..b91105330c<br>
--- /dev/null<br>
+++ b/meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch<br>
@@ -0,0 +1,29 @@<br>
+From cd9b56224895576125e91cca317ace8a80f3eb77 Mon Sep 17 00:00:00 2001<br>
+From: Piotr Tworek &lt;<a href="mailto:tworaz@tworaz.net" target="_blank">tworaz@tworaz.net</a>&gt;<br>
+Date: Sat, 27 Jul 2019 10:19:11 +0200<br>
+Subject: [PATCH] Don&#39;t use build time hardcoded python binary path.<br>
+<br>
+This path obviously won&#39;t work on target since they refer to build<br>
+machine directory structure. Native builds will also fail if local.conf<br>
+has INHERIT+=rm_work. Instread of hardcoding path to python binary use<br>
+whatever is found in PATH first. This should also allow the tool to use<br>
+python3 binary provided in recipe-sysroot-native.<br>
+<br>
+Upstream-Status: Inappropriate [OE specific]<br>
+---<br>
+ <a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a> | 2 +-<br>
+ 1 file changed, 1 insertion(+), 1 deletion(-)<br>
+<br>
+diff --git a/<a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a> b/<a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a><br>
+index b3c0033..7df2476 100755<br>
+--- a/<a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a><br>
++++ b/<a href="http://itstool.in" rel="noreferrer" target="_blank">itstool.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#!@PYTHON@ -s<br>
++#!/usr/bin/env -S python3 -s<br>
+ #<br>
+ # Copyright (c) 2010-2018 Shaun McCance &lt;<a href="mailto:shaunm@gnome.org" target="_blank">shaunm@gnome.org</a>&gt;<br>
+ #<br>
+--<br>
+2.21.0<br>
+<br>
diff --git a/meta/recipes-support/itstool/<a href="http://itstool_2.0.6.bb" rel="noreferrer" target="_blank">itstool_2.0.6.bb</a> b/meta/recipes-support/itstool/<a href="http://itstool_2.0.6.bb" rel="noreferrer" target="_blank">itstool_2.0.6.bb</a><br>
new file mode 100644<br>
index 0000000000..8290c5e581<br>
--- /dev/null<br>
+++ b/meta/recipes-support/itstool/<a href="http://itstool_2.0.6.bb" rel="noreferrer" target="_blank">itstool_2.0.6.bb</a><br>
@@ -0,0 +1,20 @@<br>
+SUMMARY = &quot;ITS Tool allows you to translate your XML documents with PO files&quot;<br>
+HOMEPAGE = &quot;<a href="http://itstool.org/" rel="noreferrer" target="_blank">http://itstool.org/</a>&quot;<br>
+LICENSE = &quot;GPLv3&quot;<br>
+LIC_FILES_CHKSUM = &quot;file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5&quot;<br>
+<br>
+inherit autotools python3native<br>
+<br>
+DEPENDS = &quot;libxml2-native&quot;<br>
+<br>
+SRC_URI = &quot;<a href="http://files.itstool.org/$%7BBPN%7D/$%7BBPN%7D-$%7BPV%7D.tar.bz2" rel="noreferrer" target="_blank">http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2</a>&quot;<br>
+SRC_URI_append_class-native = &quot; file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch&quot;<br>
+SRC_URI_append_class-target = &quot; file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch&quot;<br>
+<br>
+SRC_URI[md5sum] = &quot;4306eeba4f4aee6b393d14f9c3c57ca1&quot;<br>
+SRC_URI[sha256sum] = &quot;6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9&quot;<br>
+<br>
+BBCLASSEXTEND = &quot;native&quot;<br>
+<br>
+RDEPENDS_${PN} += &quot;libxml2-python&quot;<br>
+RDEPENDS_${PN}_class-native = &quot;&quot;<br>
-- <br>
2.21.0<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>