summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-04-27 17:28:09 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-18 14:01:46 +0100
commitc91c70b5ab3b9e258e093eb75aad2a5151aa96d3 (patch)
tree411cb5c10fee00b3cf0e93c277753543eea082f7
parent4725e56f8b0ec6b485f86c5ee346c6e82d5d4c6f (diff)
downloadpoky-c91c70b5ab3b9e258e093eb75aad2a5151aa96d3.tar.gz
opkg-utils: move to Python 3
The scripts were fixed to be compatible with py3 some time ago, but the shebang continued to refer to python 2.x. (From OE-Core rev: bb5718b631151cff840bcfa171ad4f8326c2132e) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch112
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils_git.bb5
2 files changed, 115 insertions, 2 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch
new file mode 100644
index 0000000000..c36ae2ffda
--- /dev/null
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch
@@ -0,0 +1,112 @@
1From d42b23f4fb5d6bd58e92e995fe5befc76efbae0c Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 27 Apr 2017 15:47:58 +0300
4Subject: [PATCH] Switch all scripts to use Python 3.x
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 makePackage | 2 +-
10 opkg-compare-indexes | 2 +-
11 opkg-graph-deps | 2 +-
12 opkg-list-fields | 2 +-
13 opkg-make-index | 2 +-
14 opkg-show-deps | 2 +-
15 opkg-unbuild | 2 +-
16 opkg-update-index | 2 +-
17 opkg.py | 2 +-
18 9 files changed, 9 insertions(+), 9 deletions(-)
19
20diff --git a/makePackage b/makePackage
21index 4bdfc56..02124dd 100755
22--- a/makePackage
23+++ b/makePackage
24@@ -1,4 +1,4 @@
25-#!/usr/bin/python
26+#!/usr/bin/env python3
27
28 # The general algorithm this program follows goes like this:
29 # Run tar to extract control from control.tar.gz from the package.
30diff --git a/opkg-compare-indexes b/opkg-compare-indexes
31index b60d20a..80c1263 100755
32--- a/opkg-compare-indexes
33+++ b/opkg-compare-indexes
34@@ -1,4 +1,4 @@
35-#!/usr/bin/env python
36+#!/usr/bin/env python3
37 from __future__ import absolute_import
38 from __future__ import print_function
39
40diff --git a/opkg-graph-deps b/opkg-graph-deps
41index 6653fd5..f1e376a 100755
42--- a/opkg-graph-deps
43+++ b/opkg-graph-deps
44@@ -1,4 +1,4 @@
45-#!/usr/bin/env python
46+#!/usr/bin/env python3
47 from __future__ import absolute_import
48 from __future__ import print_function
49
50diff --git a/opkg-list-fields b/opkg-list-fields
51index c14a90f..24f7955 100755
52--- a/opkg-list-fields
53+++ b/opkg-list-fields
54@@ -1,4 +1,4 @@
55-#!/usr/bin/env python
56+#!/usr/bin/env python3
57 from __future__ import absolute_import
58 from __future__ import print_function
59
60diff --git a/opkg-make-index b/opkg-make-index
61index 3f757f6..2988f9f 100755
62--- a/opkg-make-index
63+++ b/opkg-make-index
64@@ -1,4 +1,4 @@
65-#!/usr/bin/env python
66+#!/usr/bin/env python3
67 from __future__ import absolute_import
68 from __future__ import print_function
69
70diff --git a/opkg-show-deps b/opkg-show-deps
71index 153f21e..4e18b4f 100755
72--- a/opkg-show-deps
73+++ b/opkg-show-deps
74@@ -1,4 +1,4 @@
75-#!/usr/bin/env python
76+#!/usr/bin/env python3
77 from __future__ import absolute_import
78 from __future__ import print_function
79
80diff --git a/opkg-unbuild b/opkg-unbuild
81index 4f36bec..57642c9 100755
82--- a/opkg-unbuild
83+++ b/opkg-unbuild
84@@ -1,4 +1,4 @@
85-#!/usr/bin/env python
86+#!/usr/bin/env python3
87 from __future__ import absolute_import
88 from __future__ import print_function
89
90diff --git a/opkg-update-index b/opkg-update-index
91index 341c1c2..7bff8a1 100755
92--- a/opkg-update-index
93+++ b/opkg-update-index
94@@ -1,4 +1,4 @@
95-#!/usr/bin/env python
96+#!/usr/bin/env python3
97 from __future__ import absolute_import
98
99 import sys, os
100diff --git a/opkg.py b/opkg.py
101index 2ecac8a..7e64de4 100644
102--- a/opkg.py
103+++ b/opkg.py
104@@ -1,4 +1,4 @@
105-#!/usr/bin/env python
106+#!/usr/bin/env python3
107 # Copyright (C) 2001 Alexander S. Guy <a7r@andern.org>
108 # Andern Research Labs
109 #
110--
1112.11.0
112
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 9deea0f5e5..2460a26324 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -4,13 +4,14 @@ SECTION = "base"
4HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils" 4HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" 7 file://opkg.py;beginline=2;endline=18;md5=63ce9e6bcc445181cd9e4baf4b4ccc35"
8PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" 8PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}"
9 9
10SRCREV = "1a708fd73d10c2b7677dd4cc4e017746ebbb9166" 10SRCREV = "1a708fd73d10c2b7677dd4cc4e017746ebbb9166"
11PV = "0.3.4+git${SRCPV}" 11PV = "0.3.4+git${SRCPV}"
12 12
13SRC_URI = "git://git.yoctoproject.org/opkg-utils \ 13SRC_URI = "git://git.yoctoproject.org/opkg-utils \
14 file://0001-Switch-all-scripts-to-use-Python-3.x.patch \
14" 15"
15SRC_URI_append_class-native = " file://tar_ignore_error.patch" 16SRC_URI_append_class-native = " file://tar_ignore_error.patch"
16 17
@@ -18,7 +19,7 @@ S = "${WORKDIR}/git"
18 19
19TARGET_CC_ARCH += "${LDFLAGS}" 20TARGET_CC_ARCH += "${LDFLAGS}"
20 21
21PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold" 22PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-subprocess python3-pickle python3-compression python3-textutils python3-stringold"
22PYTHONRDEPS_class-native = "" 23PYTHONRDEPS_class-native = ""
23 24
24PACKAGECONFIG = "python update-alternatives" 25PACKAGECONFIG = "python update-alternatives"