From 132b12b26e4319911f4e22e5f10468a58803016d Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Wed, 11 Apr 2012 17:26:15 +0300 Subject: createrepo: Python scripts should use the python interpreter from env Added path to modify the hardcoded path of python interpreter from python scripts. The python interpreter should be the one from native sysroot and not the one from host machine. [YOCTO #2134] (From OE-Core rev: 164475b9669dc99c14461e1d749ec0626c62cb71) Signed-off-by: Andrei Gherzan Signed-off-by: Richard Purdie --- ...n-scripts-should-use-interpreter-from-env.patch | 47 ++++++++++++++++++++++ .../createrepo/createrepo_0.4.11.bb | 3 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch b/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch new file mode 100644 index 0000000000..80205a1507 --- /dev/null +++ b/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch @@ -0,0 +1,47 @@ +Author: Andrei Gherzan + +Python interpreter should be use from PATH - native python - and not the one from +host. + +Upstream-Status: Inappropriate [configuration] + +Index: createrepo-0.4.11/genpkgmetadata.py +=================================================================== +--- createrepo-0.4.11.orig/genpkgmetadata.py 2012-04-10 17:14:05.278649384 +0300 ++++ createrepo-0.4.11/genpkgmetadata.py 2012-04-10 17:14:22.290648886 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -t ++#! /usr/bin/env python + # primary functions and glue for generating the repository metadata + # + +Index: createrepo-0.4.11/modifyrepo.py +=================================================================== +--- createrepo-0.4.11.orig/modifyrepo.py 2012-04-10 17:14:09.106649272 +0300 ++++ createrepo-0.4.11/modifyrepo.py 2012-04-10 17:14:27.818648725 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#! /usr/bin/env python + # $Id$ + # + # This tools is used to insert arbitrary metadata into an RPM repository. +Index: createrepo-0.4.11/dumpMetadata.py +=================================================================== +--- createrepo-0.4.11.orig/dumpMetadata.py 2012-04-10 17:19:23.874640068 +0300 ++++ createrepo-0.4.11/dumpMetadata.py 2012-04-10 17:19:34.502639756 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -t ++#! /usr/bin/env python + # base classes and functions for dumping out package Metadata + # + # This program is free software; you can redistribute it and/or modify +Index: createrepo-0.4.11/readMetadata.py +=================================================================== +--- createrepo-0.4.11.orig/readMetadata.py 2012-04-10 17:19:19.626640193 +0300 ++++ createrepo-0.4.11/readMetadata.py 2012-04-10 17:19:40.198639590 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -t ++#! /usr/bin/env python + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb index ba1d04b2bd..989a7456e8 100644 --- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb +++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb @@ -4,10 +4,11 @@ HOMEPAGE = "http://createrepo.baseurl.org/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" -PR = "r1" +PR = "r2" SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ file://fix-native-install.patch \ + file://python-scripts-should-use-interpreter-from-env.patch \ " SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" -- cgit v1.2.3-54-g00ecf