diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-06 17:26:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-08 10:57:19 +0000 |
commit | d772d8bb1b79860a0d3667e64015e9770520b80b (patch) | |
tree | fdbf356c71dc271e4d6688a48250c30dea179f9b /meta/recipes-devtools/python | |
parent | e2c3247c233876ab090c9ce3d5325a6d46ab350f (diff) | |
download | poky-d772d8bb1b79860a0d3667e64015e9770520b80b.tar.gz |
python: make the python 3.x version of 2to3 utility the default one
(From OE-Core rev: 98ba7ba8c5bc091f5cc590299f1a636c9b8dc1f5)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r-- | meta/recipes-devtools/python/python/python2-manifest.json | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python_2.7.15.bb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json index 81f1c24f97..eb52e862ab 100644 --- a/meta/recipes-devtools/python/python/python2-manifest.json +++ b/meta/recipes-devtools/python/python/python2-manifest.json | |||
@@ -109,7 +109,7 @@ | |||
109 | "core" | 109 | "core" |
110 | ], | 110 | ], |
111 | "files": [ | 111 | "files": [ |
112 | "${bindir}/2to3", | 112 | "${bindir}/2to3*", |
113 | "${libdir}/python2.7/lib2to3" | 113 | "${libdir}/python2.7/lib2to3" |
114 | ] | 114 | ] |
115 | }, | 115 | }, |
diff --git a/meta/recipes-devtools/python/python_2.7.15.bb b/meta/recipes-devtools/python/python_2.7.15.bb index f462d08725..8df1dfd1ba 100644 --- a/meta/recipes-devtools/python/python_2.7.15.bb +++ b/meta/recipes-devtools/python/python_2.7.15.bb | |||
@@ -131,6 +131,9 @@ do_install() { | |||
131 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'bdb', d)}" ]; then | 131 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'bdb', d)}" ]; then |
132 | rm -rf ${D}/${libdir}/python${PYTHON_MAJMIN}/bsddb | 132 | rm -rf ${D}/${libdir}/python${PYTHON_MAJMIN}/bsddb |
133 | fi | 133 | fi |
134 | |||
135 | # Python 3.x version of 2to3 is now the default | ||
136 | mv ${D}/${bindir}/2to3 ${D}/${bindir}/2to3-${PYTHON_MAJMIN} | ||
134 | } | 137 | } |
135 | 138 | ||
136 | do_install_append_class-nativesdk () { | 139 | do_install_append_class-nativesdk () { |