summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2020-01-17 22:28:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-19 13:24:38 +0000
commitb5aee555ab2f75f4b4f79ce0a154d6f77ce4a73b (patch)
tree33313a5d14d94125cbdb12f3a7048603c7a2cb92
parent3b7c1d7ffb7c0af8c7f6e327541fecc9aa287a91 (diff)
downloadpoky-b5aee555ab2f75f4b4f79ce0a154d6f77ce4a73b.tar.gz
itstool: add from meta-oe
Recent versions of shared-mime-info depend on itstool (From OE-Core rev: 0bab36c5746dae2e2288244434cafe9cadb4b0c0) Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch35
-rw-r--r--meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch29
-rw-r--r--meta/recipes-support/itstool/itstool_2.0.6.bb20
4 files changed, 85 insertions, 0 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 7d47677d3b..ffb6da7dae 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -281,6 +281,7 @@ RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae <changhyeok.bae@gmail.com>"
281RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae <changhyeok.bae@gmail.com>" 281RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae <changhyeok.bae@gmail.com>"
282RECIPE_MAINTAINER_pn-iputils = "Changhyeok Bae <changhyeok.bae@gmail.com>" 282RECIPE_MAINTAINER_pn-iputils = "Changhyeok Bae <changhyeok.bae@gmail.com>"
283RECIPE_MAINTAINER_pn-iso-codes = "Alexander Kanavin <alex.kanavin@gmail.com>" 283RECIPE_MAINTAINER_pn-iso-codes = "Alexander Kanavin <alex.kanavin@gmail.com>"
284RECIPE_MAINTAINER_pn-itstool = "Andreas Müller <schnitzeltony@gmail.com>"
284RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae <changhyeok.bae@gmail.com>" 285RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae <changhyeok.bae@gmail.com>"
285RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal <anuj.mittal@intel.com>" 286RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal <anuj.mittal@intel.com>"
286RECIPE_MAINTAINER_pn-json-c = "Yi Zhao <yi.zhao@windriver.com>" 287RECIPE_MAINTAINER_pn-json-c = "Yi Zhao <yi.zhao@windriver.com>"
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
new file mode 100644
index 0000000000..19a858bd75
--- /dev/null
+++ b/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch
@@ -0,0 +1,35 @@
1From 335ef14fc801c9dfbe7e5692dc71cfbe72049d2b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Sun, 27 Oct 2019 16:38:52 +0100
4Subject: [PATCH] Native: Don't use build time hardcoded python binary path.
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9This is same patch as used for target build except that we do not use the
10'-S' and '-s' option because '-S' is relatively young [1] and elder build-host
11don't support it [2]
12
13[1] https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30
14[2] https://errors.yoctoproject.org/Errors/Details/274743/
15
16Upstream-Status: Inappropriate [OE specific]
17
18Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
19---
20 itstool.in | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/itstool.in b/itstool.in
24index e64cd34..05d264f 100755
25--- a/itstool.in
26+++ b/itstool.in
27@@ -1,4 +1,4 @@
28-#!@PYTHON@ -s
29+#!/usr/bin/env python3
30 #
31 # Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org>
32 #
33--
342.21.0
35
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
new file mode 100644
index 0000000000..b91105330c
--- /dev/null
+++ b/meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch
@@ -0,0 +1,29 @@
1From cd9b56224895576125e91cca317ace8a80f3eb77 Mon Sep 17 00:00:00 2001
2From: Piotr Tworek <tworaz@tworaz.net>
3Date: Sat, 27 Jul 2019 10:19:11 +0200
4Subject: [PATCH] Don't use build time hardcoded python binary path.
5
6This path obviously won't work on target since they refer to build
7machine directory structure. Native builds will also fail if local.conf
8has INHERIT+=rm_work. Instread of hardcoding path to python binary use
9whatever is found in PATH first. This should also allow the tool to use
10python3 binary provided in recipe-sysroot-native.
11
12Upstream-Status: Inappropriate [OE specific]
13---
14 itstool.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/itstool.in b/itstool.in
18index b3c0033..7df2476 100755
19--- a/itstool.in
20+++ b/itstool.in
21@@ -1,4 +1,4 @@
22-#!@PYTHON@ -s
23+#!/usr/bin/env -S python3 -s
24 #
25 # Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org>
26 #
27--
282.21.0
29
diff --git a/meta/recipes-support/itstool/itstool_2.0.6.bb b/meta/recipes-support/itstool/itstool_2.0.6.bb
new file mode 100644
index 0000000000..8290c5e581
--- /dev/null
+++ b/meta/recipes-support/itstool/itstool_2.0.6.bb
@@ -0,0 +1,20 @@
1SUMMARY = "ITS Tool allows you to translate your XML documents with PO files"
2HOMEPAGE = "http://itstool.org/"
3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5"
5
6inherit autotools python3native
7
8DEPENDS = "libxml2-native"
9
10SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2"
11SRC_URI_append_class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch"
12SRC_URI_append_class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch"
13
14SRC_URI[md5sum] = "4306eeba4f4aee6b393d14f9c3c57ca1"
15SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9"
16
17BBCLASSEXTEND = "native"
18
19RDEPENDS_${PN} += "libxml2-python"
20RDEPENDS_${PN}_class-native = ""