On 10/25/2016 11:43 AM, Davis, Michael wrote: > From: "Davis, Michael" <michael.da...@essvote.com> > > 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.ja...@gmail.com> > (cherry picked from commit 54c7e784c7689d8cff4173db716bb7913c65315f) > Signed-off-by: Michael Davis <michael.da...@essvote.com>
merged to staging. Armin > --- > .../recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb | 24 > ++++++++++++++++++---- > 1 file 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 cc72549..0d2cb33 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" > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
