diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-03-27 16:19:55 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-28 08:43:13 +0100 |
commit | 8c1c392ca34da1c64336d0aa2d0a26b9c23d8d39 (patch) | |
tree | 37f509b2269d4a37cebcde905b84ec2e52c61d18 /meta/recipes-devtools/dnf/dnf | |
parent | 3d29214b20433a506a3d59cdc08fc1a9be09a5a0 (diff) | |
download | poky-8c1c392ca34da1c64336d0aa2d0a26b9c23d8d39.tar.gz |
dnf: move the entire dnf/rpm4 stack to Python 3
[YOCTO #11180]
(From OE-Core rev: bedcdc4cf921b70a8cfb16c6684668d0ac9e1942)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dnf/dnf')
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0028-Use-backports.lzma-not-lzma.patch | 30 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch | 6 |
2 files changed, 3 insertions, 33 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0028-Use-backports.lzma-not-lzma.patch b/meta/recipes-devtools/dnf/dnf/0028-Use-backports.lzma-not-lzma.patch deleted file mode 100644 index 57038a8c7d..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0028-Use-backports.lzma-not-lzma.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 89af5c84d4b920d22ae882fcc5ab71ba09443cea Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 30 Dec 2016 18:28:18 +0200 | ||
4 | Subject: [PATCH 28/30] Use backports.lzma, not lzma | ||
5 | |||
6 | This is needed when using Python 2.x and should be dropped | ||
7 | after moving to Python 3.x | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | dnf/yum/misc.py | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/dnf/yum/misc.py b/dnf/yum/misc.py | ||
16 | index 441b0148..6b4aea0a 100644 | ||
17 | --- a/dnf/yum/misc.py | ||
18 | +++ b/dnf/yum/misc.py | ||
19 | @@ -37,7 +37,7 @@ import gpgme.editutil | ||
20 | import gzip | ||
21 | import hashlib | ||
22 | import io | ||
23 | -import lzma | ||
24 | +import backports.lzma | ||
25 | import os | ||
26 | import os.path | ||
27 | import pwd | ||
28 | -- | ||
29 | 2.11.0 | ||
30 | |||
diff --git a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch index 7fc8afef53..61328e6ec5 100644 --- a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch +++ b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch | |||
@@ -19,7 +19,7 @@ index 5b06aa26..9f6f703e 100755 | |||
19 | +++ b/bin/dnf-automatic.in | 19 | +++ b/bin/dnf-automatic.in |
20 | @@ -1,4 +1,4 @@ | 20 | @@ -1,4 +1,4 @@ |
21 | -#!@PYTHON_EXECUTABLE@ | 21 | -#!@PYTHON_EXECUTABLE@ |
22 | +#!/usr/bin/env python | 22 | +#!/usr/bin/env python3 |
23 | # dnf-automatic executable. | 23 | # dnf-automatic executable. |
24 | # | 24 | # |
25 | # Copyright (C) 2014-2016 Red Hat, Inc. | 25 | # Copyright (C) 2014-2016 Red Hat, Inc. |
@@ -29,7 +29,7 @@ index 645d0f06..ab141abd 100755 | |||
29 | +++ b/bin/dnf.in | 29 | +++ b/bin/dnf.in |
30 | @@ -1,4 +1,4 @@ | 30 | @@ -1,4 +1,4 @@ |
31 | -#!@PYTHON_EXECUTABLE@ | 31 | -#!@PYTHON_EXECUTABLE@ |
32 | +#!/usr/bin/env python | 32 | +#!/usr/bin/env python3 |
33 | # The dnf executable script. | 33 | # The dnf executable script. |
34 | # | 34 | # |
35 | # Copyright (C) 2012-2016 Red Hat, Inc. | 35 | # Copyright (C) 2012-2016 Red Hat, Inc. |
@@ -39,7 +39,7 @@ index f1fee071..013dc8c5 100755 | |||
39 | +++ b/bin/yum.in | 39 | +++ b/bin/yum.in |
40 | @@ -1,4 +1,4 @@ | 40 | @@ -1,4 +1,4 @@ |
41 | -#!@PYTHON_EXECUTABLE@ | 41 | -#!@PYTHON_EXECUTABLE@ |
42 | +#!/usr/bin/env python | 42 | +#!/usr/bin/env python3 |
43 | # The dnf executable script. | 43 | # The dnf executable script. |
44 | # | 44 | # |
45 | # Copyright (C) 2016 Red Hat, Inc. | 45 | # Copyright (C) 2016 Red Hat, Inc. |