diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2012-04-11 17:26:15 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-13 16:04:11 +0100 |
commit | 132b12b26e4319911f4e22e5f10468a58803016d (patch) | |
tree | d02fabc2d970c9578a2a2ffde516f8b737f7e143 | |
parent | 0d7b9098175c6a703ae2e85530372522774a6724 (diff) | |
download | poky-132b12b26e4319911f4e22e5f10468a58803016d.tar.gz |
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 <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch | 47 | ||||
-rw-r--r-- | meta/recipes-support/createrepo/createrepo_0.4.11.bb | 3 |
2 files changed, 49 insertions, 1 deletions
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 @@ | |||
1 | Author: Andrei Gherzan <andrei@gherzan.ro> | ||
2 | |||
3 | Python interpreter should be use from PATH - native python - and not the one from | ||
4 | host. | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Index: createrepo-0.4.11/genpkgmetadata.py | ||
9 | =================================================================== | ||
10 | --- createrepo-0.4.11.orig/genpkgmetadata.py 2012-04-10 17:14:05.278649384 +0300 | ||
11 | +++ createrepo-0.4.11/genpkgmetadata.py 2012-04-10 17:14:22.290648886 +0300 | ||
12 | @@ -1,4 +1,4 @@ | ||
13 | -#!/usr/bin/python -t | ||
14 | +#! /usr/bin/env python | ||
15 | # primary functions and glue for generating the repository metadata | ||
16 | # | ||
17 | |||
18 | Index: createrepo-0.4.11/modifyrepo.py | ||
19 | =================================================================== | ||
20 | --- createrepo-0.4.11.orig/modifyrepo.py 2012-04-10 17:14:09.106649272 +0300 | ||
21 | +++ createrepo-0.4.11/modifyrepo.py 2012-04-10 17:14:27.818648725 +0300 | ||
22 | @@ -1,4 +1,4 @@ | ||
23 | -#!/usr/bin/env python | ||
24 | +#! /usr/bin/env python | ||
25 | # $Id$ | ||
26 | # | ||
27 | # This tools is used to insert arbitrary metadata into an RPM repository. | ||
28 | Index: createrepo-0.4.11/dumpMetadata.py | ||
29 | =================================================================== | ||
30 | --- createrepo-0.4.11.orig/dumpMetadata.py 2012-04-10 17:19:23.874640068 +0300 | ||
31 | +++ createrepo-0.4.11/dumpMetadata.py 2012-04-10 17:19:34.502639756 +0300 | ||
32 | @@ -1,4 +1,4 @@ | ||
33 | -#!/usr/bin/python -t | ||
34 | +#! /usr/bin/env python | ||
35 | # base classes and functions for dumping out package Metadata | ||
36 | # | ||
37 | # This program is free software; you can redistribute it and/or modify | ||
38 | Index: createrepo-0.4.11/readMetadata.py | ||
39 | =================================================================== | ||
40 | --- createrepo-0.4.11.orig/readMetadata.py 2012-04-10 17:19:19.626640193 +0300 | ||
41 | +++ createrepo-0.4.11/readMetadata.py 2012-04-10 17:19:40.198639590 +0300 | ||
42 | @@ -1,4 +1,4 @@ | ||
43 | -#!/usr/bin/python -t | ||
44 | +#! /usr/bin/env python | ||
45 | |||
46 | # This program is free software; you can redistribute it and/or modify | ||
47 | # 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/" | |||
4 | LICENSE = "GPLv2+" | 4 | LICENSE = "GPLv2+" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" |
6 | 6 | ||
7 | PR = "r1" | 7 | PR = "r2" |
8 | 8 | ||
9 | SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ | 9 | SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ |
10 | file://fix-native-install.patch \ | 10 | file://fix-native-install.patch \ |
11 | file://python-scripts-should-use-interpreter-from-env.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" | 14 | SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" |