aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavis, Michael <michael.davis@essvote.com>2016-10-10 16:51:16 +0000
committerArmin Kuster <akuster808@gmail.com>2016-11-03 08:23:51 -0700
commit55c8a76da5dc099a7bc3838495c672140cedb78e (patch)
treee2ec9fb3c3c5206d0689f1703a45272ad588eea7
parent4ace5eac373b9d508426671b1a7bccd7b0d7c283 (diff)
downloadmeta-openembedded-krogoth.tar.gz
meta-openembedded-krogoth.tar.bz2
meta-openembedded-krogoth.zip
pcsc-lite: Seperate GPLV3 portions from BSDkrogoth-nextkrogoth
GPLV3 and BSD portions were originally placed in the same package. The GPLv3 portion has been seperated into pcsc-lite-spy and pcsc-lite-spy-dev so the package can be used with GPLv3 blacklisted. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 54c7e784c7689d8cff4173db716bb7913c65315f) Signed-off-by: Michael Davis <michael.davis@essvote.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb24
1 files changed, 20 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
index cc72549cf..0d2cb332a 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
@@ -1,7 +1,13 @@
SUMMARY = "PC/SC Lite smart card framework and applications"
HOMEPAGE = "http://pcsclite.alioth.debian.org/"
LICENSE = "BSD & GPLv3+"
-LICENSE_${PN}-dev = "GPLv3+"
+LICENSE_${PN} = "BSD"
+LICENSE_${PN}-lib = "BSD"
+LICENSE_${PN}-doc = "BSD"
+LICENSE_${PN}-dev = "BSD"
+LICENSE_${PN}-dbg = "BSD & GPLv3+"
+LICENSE_${PN}-spy = "GPLv3+"
+LICENSE_${PN}-spy-dev = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=bcfbd85230ac3c586fb294c8b627cf32"
DEPENDS = "udev"
@@ -20,14 +26,24 @@ EXTRA_OECONF = " \
S = "${WORKDIR}/pcsc-lite-${PV}"
-PACKAGES =+ "${PN}-lib"
+PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev"
RRECOMMENDS_${PN} = "ccid"
-FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
+FILES_${PN} = "${sbindir}/pcscd"
+FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}"
+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 \
+ ${libdir}/libpcscspy.so "
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "pcscd.socket"
-RDEPENDS_${PN} +="python"
+RDEPENDS_${PN}-spy +="python"