diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python-pyasn1.inc | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch | 28 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb (renamed from meta/recipes-devtools/python/python3-pyasn1_0.4.8.bb) | 1 |
3 files changed, 5 insertions, 34 deletions
diff --git a/meta/recipes-devtools/python/python-pyasn1.inc b/meta/recipes-devtools/python/python-pyasn1.inc index 126d0388ef..9eb87354cf 100644 --- a/meta/recipes-devtools/python/python-pyasn1.inc +++ b/meta/recipes-devtools/python/python-pyasn1.inc | |||
@@ -1,10 +1,9 @@ | |||
1 | SUMMARY = "Python library implementing ASN.1 types." | 1 | SUMMARY = "Python library implementing ASN.1 types." |
2 | HOMEPAGE = "http://pyasn1.sourceforge.net/" | 2 | HOMEPAGE = "http://pyasn1.sourceforge.net/" |
3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=a14482d15c2249de3b6f0e8a47e021fd" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=190f79253908c986e6cacf380c3a5f6d" |
5 | 5 | ||
6 | SRC_URI[md5sum] = "dffae4ff9f997a83324b3f33fe62be54" | 6 | SRC_URI[sha256sum] = "97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde" |
7 | SRC_URI[sha256sum] = "aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba" | ||
8 | 7 | ||
9 | RDEPENDS:${PN}:class-target += " \ | 8 | RDEPENDS:${PN}:class-target += " \ |
10 | ${PYTHON_PN}-codecs \ | 9 | ${PYTHON_PN}-codecs \ |
@@ -18,9 +17,8 @@ BBCLASSEXTEND = "native nativesdk" | |||
18 | inherit ptest | 17 | inherit ptest |
19 | 18 | ||
20 | SRC_URI += " \ | 19 | SRC_URI += " \ |
21 | file://run-ptest \ | 20 | file://run-ptest \ |
22 | file://0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch \ | 21 | " |
23 | " | ||
24 | 22 | ||
25 | RDEPENDS:${PN}-ptest += " \ | 23 | RDEPENDS:${PN}-ptest += " \ |
26 | ${PYTHON_PN}-pytest \ | 24 | ${PYTHON_PN}-pytest \ |
diff --git a/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch b/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch deleted file mode 100644 index 30ac9a6684..0000000000 --- a/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From db8f1a7930c6b5826357646746337dafc983f953 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ilya Etingof <etingof@gmail.com> | ||
3 | Date: Sat, 21 Mar 2020 19:05:03 +0100 | ||
4 | Subject: [PATCH] Fix `DeprecationWarning: __int__ returned non-int` on Py3 | ||
5 | |||
6 | In `BitString.__int__()` | ||
7 | Upstream-Status: Backport | ||
8 | Signed-off-by: Yulong Liu <yulong.liu@windriver.com> | ||
9 | --- | ||
10 | pyasn1/type/univ.py | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/pyasn1/type/univ.py b/pyasn1/type/univ.py | ||
14 | index 10924c3..488241f 100644 | ||
15 | --- a/pyasn1/type/univ.py | ||
16 | +++ b/pyasn1/type/univ.py | ||
17 | @@ -551,7 +551,7 @@ class BitString(base.SimpleAsn1Type): | ||
18 | return self.clone(SizedInteger(self._value >> count).setBitLength(max(0, len(self._value) - count))) | ||
19 | |||
20 | def __int__(self): | ||
21 | - return self._value | ||
22 | + return int(self._value) | ||
23 | |||
24 | def __float__(self): | ||
25 | return float(self._value) | ||
26 | -- | ||
27 | 2.25.1 | ||
28 | |||
diff --git a/meta/recipes-devtools/python/python3-pyasn1_0.4.8.bb b/meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb index a5e2a71362..0519ba5edb 100644 --- a/meta/recipes-devtools/python/python3-pyasn1_0.4.8.bb +++ b/meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb | |||
@@ -1,2 +1,3 @@ | |||
1 | inherit pypi setuptools3 | 1 | inherit pypi setuptools3 |
2 | require python-pyasn1.inc | 2 | require python-pyasn1.inc |
3 | |||