diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-oe/recipes-support/pcsc-lite | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-support/pcsc-lite')
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch | 43 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb (renamed from external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb) | 29 |
2 files changed, 62 insertions, 10 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch b/external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch new file mode 100644 index 00000000..3e7b0add --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch @@ -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 + diff --git a/external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb b/external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb index 10f724e6..91d77ac9 100644 --- a/external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb +++ b/external/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb @@ -8,27 +8,34 @@ LICENSE_${PN}-dev = "BSD" LICENSE_${PN}-dbg = "BSD & GPLv3+" LICENSE_${PN}-spy = "GPLv3+" LICENSE_${PN}-spy-dev = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f38b3d1c7ef7fc2c8b6d20cd38efdc29" -DEPENDS = "udev" - -SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" -SRC_URI[md5sum] = "0ec103b1ef298d0c58d6ef6b00b9cf17" -SRC_URI[sha256sum] = "6a358f61ed3b66a7f6e1f4e794a94c7be4c81b7a58ec360c33791e8d7d9bd405" +LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" +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" -inherit autotools systemd pkgconfig +inherit autotools systemd pkgconfig perlnative EXTRA_OECONF = " \ --disable-libusb \ - --enable-libudev \ --enable-usbdropdir=${libdir}/pcsc/drivers \ " S = "${WORKDIR}/pcsc-lite-${PV}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" +PACKAGECONFIG_class-native ??= "" + +PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," +PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" + PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" RRECOMMENDS_${PN} = "ccid" +RRECOMMENDS_${PN}_class-native = "" FILES_${PN} = "${sbindir}/pcscd" FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" @@ -36,7 +43,7 @@ FILES_${PN}-dev = "${includedir} \ ${libdir}/pkgconfig \ ${libdir}/libpcsclite.la \ ${libdir}/libpcsclite.so" - + FILES_${PN}-spy = "${bindir}/pcsc-spy \ ${libdir}/libpcscspy*${SOLIBS}" FILES_${PN}-spy-dev = "${libdir}/libpcscspy.la \ @@ -46,4 +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" |