[OE-core] [PATCH 01/11] itstool: add from meta-oe

[Alexander Kanavin]

This also needs a maintainers.inc entry.

Alex

On Thu, 9 Jan 2020 at 21:26, Andreas Müller <schnitzeltony at gmail.com> wrote:

> Recent versions of shared-mime-info depend on itstool
>
> Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
> ---
>  ...-build-time-hardcoded-python-binary-.patch | 35 +++++++++++++++++++
>  ...ld-time-hardcoded-python-binary-path.patch | 29 +++++++++++++++
>  meta/recipes-support/itstool/itstool_2.0.6.bb | 20 +++++++++++
>  3 files changed, 84 insertions(+)
>  create mode 100644
> meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch
>  create mode 100644
> meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch
>  create mode 100644 meta/recipes-support/itstool/itstool_2.0.6.bb
>
> 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 @@
> +From 335ef14fc801c9dfbe7e5692dc71cfbe72049d2b Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
> +Date: Sun, 27 Oct 2019 16:38:52 +0100
> +Subject: [PATCH] Native: Don't use build time hardcoded python binary
> path.
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +This is same patch as used for target build except that we do not use the
> +'-S' and '-s' option because '-S' is relatively young [1] and elder
> build-host
> +don't support it [2]
> +
> +[1]
> https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30
> +[2] https://errors.yoctoproject.org/Errors/Details/274743/
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
> +---
> + itstool.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/itstool.in b/itstool.in
> +index e64cd34..05d264f 100755
> +--- a/itstool.in
> ++++ b/itstool.in
> +@@ -1,4 +1,4 @@
> +-#!@PYTHON@ -s
> ++#!/usr/bin/env python3
> + #
> + # Copyright (c) 2010-2018 Shaun McCance <shaunm at gnome.org>
> + #
> +--
> +2.21.0
> +
> 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 @@
> +From cd9b56224895576125e91cca317ace8a80f3eb77 Mon Sep 17 00:00:00 2001
> +From: Piotr Tworek <tworaz at tworaz.net>
> +Date: Sat, 27 Jul 2019 10:19:11 +0200
> +Subject: [PATCH] Don't use build time hardcoded python binary path.
> +
> +This path obviously won't work on target since they refer to build
> +machine directory structure. Native builds will also fail if local.conf
> +has INHERIT+=rm_work. Instread of hardcoding path to python binary use
> +whatever is found in PATH first. This should also allow the tool to use
> +python3 binary provided in recipe-sysroot-native.
> +
> +Upstream-Status: Inappropriate [OE specific]
> +---
> + itstool.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/itstool.in b/itstool.in
> +index b3c0033..7df2476 100755
> +--- a/itstool.in
> ++++ b/itstool.in
> +@@ -1,4 +1,4 @@
> +-#!@PYTHON@ -s
> ++#!/usr/bin/env -S python3 -s
> + #
> + # Copyright (c) 2010-2018 Shaun McCance <shaunm at gnome.org>
> + #
> +--
> +2.21.0
> +
> 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 @@
> +SUMMARY = "ITS Tool allows you to translate your XML documents with PO
> files"
> +HOMEPAGE = "http://itstool.org/"
> +LICENSE = "GPLv3"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5"
> +
> +inherit autotools python3native
> +
> +DEPENDS = "libxml2-native"
> +
> +SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2"
> +SRC_URI_append_class-native = "
> file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch"
> +SRC_URI_append_class-target = "
> file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch"
> +
> +SRC_URI[md5sum] = "4306eeba4f4aee6b393d14f9c3c57ca1"
> +SRC_URI[sha256sum] =
> "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9"
> +
> +BBCLASSEXTEND = "native"
> +
> +RDEPENDS_${PN} += "libxml2-python"
> +RDEPENDS_${PN}_class-native = ""
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20200109/8dcfad6e/attachment.html>