helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

pcsc-lite: update recipe to use python3

Browse Source 
Update pcsc-lite recipe to target python3 since python2 is EOL and has
been dropped from OE-Core.

Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andrey Zhizhikin 2020-01-27 17:36:06 +00:00 committed by Khem Raj
parent 70a5edc4b5
commit 4933ca5457
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch Normal file
View File

@ -0,0 +1,43 @@
From 75dd98876951d86890ceb30be521de57fd31e3c7 Mon Sep 17 00:00:00 2001
From: Andrey Zhizhikin <andrey.z@gmail.com>
Date: Mon, 27 Jan 2020 13:27:12 +0000
Subject: [PATCH] pcsc-spy: use python3 only
Python2 has been EOL and most distributions would not provide any
support for it anymore. Since Python3 is available in all distributions
now, switch pcsc-spy to use it exclusively.
Upstream-Status: Pending
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
---
src/spy/pcsc-spy | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/spy/pcsc-spy b/src/spy/pcsc-spy
index 85222c6..965138e 100755
--- a/src/spy/pcsc-spy
+++ b/src/spy/pcsc-spy
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python3
"""
# Display PC/SC functions arguments
@@ -22,12 +22,7 @@ from __future__ import print_function
import os
import signal
import time
-try:
- # for Python3
- from queue import Queue
-except ImportError:
- # for Python2
- from Queue import Queue
+from queue import Queue
from threading import Thread
from operator import attrgetter
--
2.17.1

7
meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb
View File

@ -10,7 +10,10 @@ LICENSE_${PN}-spy = "GPLv3+"
LICENSE_${PN}-spy-dev = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6"
SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2"
SRC_URI = "\
https://pcsclite.apdu.fr/files/${BP}.tar.bz2 \
file://0001-pcsc-spy-use-python3-only.patch \
"
SRC_URI[md5sum] = "9d36882998449daceec267c68a21ff0d"
SRC_URI[sha256sum] = "3eb7be7d6ef618c0a444316cf5c1f2f9d7227aedba7a192f389fe3e7c0dfbbd9"
@ -50,6 +53,6 @@ RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "pcscd.socket"
RDEPENDS_${PN}-spy +="python"
RDEPENDS_${PN}-spy +="python3"
BBCLASSEXTEND = "native"