summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-02-21 15:59:14 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-02-21 16:44:19 +0100
commit36180ef07ea430e63c3e832a39f67f137546ec65 (patch)
tree0fd0f4343ba81299d1d5905f0e4f957a0fb4637c
parentb6a66893535ce6aa9442de67c8080e8488d50caf (diff)
downloadptxdist-36180ef07ea430e63c3e832a39f67f137546ec65.tar.gz
ptxdist-36180ef07ea430e63c3e832a39f67f137546ec65.tar.xz
pcsc-lite: version bump 1.8.14 -> 1.8.23
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/host-pcsc-lite.make3
-rw-r--r--rules/pcsc-lite.in3
-rw-r--r--rules/pcsc-lite.make15
3 files changed, 14 insertions, 7 deletions
diff --git a/rules/host-pcsc-lite.make b/rules/host-pcsc-lite.make
index e6eee9643..5a777a97f 100644
--- a/rules/host-pcsc-lite.make
+++ b/rules/host-pcsc-lite.make
@@ -24,6 +24,7 @@ HOST_PCSC_LITE_CONF_TOOL := autoconf
HOST_PCSC_LITE_CONF_OPT := \
$(HOST_AUTOCONF) \
--disable-libusb \
- --disable-libudev
+ --disable-libudev \
+ --disable-libsystemd
# vim: syntax=make
diff --git a/rules/pcsc-lite.in b/rules/pcsc-lite.in
index 4bf1528ee..016a70037 100644
--- a/rules/pcsc-lite.in
+++ b/rules/pcsc-lite.in
@@ -2,6 +2,7 @@
menuconfig PCSC_LITE
tristate "pcsc-lite "
+ select SYSTEMD if PCSC_LITE_SYSTEMD_UNIT
select UDEV if PCSC_LITE_LIBUDEV
select UDEV_LIBUDEV if PCSC_LITE_LIBUDEV
help
@@ -27,7 +28,7 @@ config PCSC_LITE_DEBUGATR
config PCSC_LITE_SYSTEMD_UNIT
bool "install systemd unit"
- depends on SYSTEMD
+ depends on INITMETHOD_SYSTEMD
default y
endif
diff --git a/rules/pcsc-lite.make b/rules/pcsc-lite.make
index cc5e6b52f..6643b417f 100644
--- a/rules/pcsc-lite.make
+++ b/rules/pcsc-lite.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-# 2015 by Marc Kleine-Budde <mkl@pengutronix.de>
+# 2015, 2018 by Marc Kleine-Budde <mkl@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -17,12 +17,11 @@ PACKAGES-$(PTXCONF_PCSC_LITE) += pcsc-lite
#
# Paths and names
#
-PCSC_LITE_VERSION := 1.8.14
-PCSC_LITE_MD5 := 439b2c8892f502e39e5b8997a7ae01ed
+PCSC_LITE_VERSION := 1.8.23
+PCSC_LITE_MD5 := 3ba4b45456a500b5f1f22bf56a2dee38
PCSC_LITE_SUFFIX := tar.bz2
PCSC_LITE := pcsc-lite-$(PCSC_LITE_VERSION)
-PCSC_LITE_TARBALL := pcsc-lite_$(PCSC_LITE_VERSION).orig.$(PCSC_LITE_SUFFIX)
-PCSC_LITE_URL := http://snapshot.debian.org/archive/debian/20150805T155032Z/pool/main/p/pcsc-lite/$(PCSC_LITE_TARBALL)
+PCSC_LITE_URL := https://pcsclite.apdu.fr/files/$(PCSC_LITE).$(PCSC_LITE_SUFFIX)
PCSC_LITE_SOURCE := $(SRCDIR)/$(PCSC_LITE).$(PCSC_LITE_SUFFIX)
PCSC_LITE_DIR := $(BUILDDIR)/$(PCSC_LITE)
PCSC_LITE_BUILD_OOT := YES
@@ -39,10 +38,16 @@ PCSC_LITE_LICENSE := BSD-3-Clause AND BSD-2-Clause AND MIT AND ISC
PCSC_LITE_CONF_TOOL := autoconf
PCSC_LITE_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --$(call ptx/endis, PTXCONF_PCSC_LITE_SYSTEMD_UNIT)-libsystemd \
+ --disable-serial \
+ --disable-usb \
--$(call ptx/endis, PTXCONF_PCSC_LITE_LIBUDEV)-libudev \
--disable-libusb \
+ --disable-polkit \
+ --disable-embedded \
--enable-usbdropdir=/usr/lib/pcsc \
--$(call ptx/endis, PTXCONF_PCSC_LITE_DEBUGATR)-debugatr \
+ --disable-filter \
--with-systemdsystemunitdir=/usr/lib/systemd/system
# ----------------------------------------------------------------------------