diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 15:00:36 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:05 +0200 |
commit | 4f3b378e6a618b6a0735f8096b49f166bf7c2a80 (patch) | |
tree | e6b763f448d116c83cd6f5961da62567eb68fca1 | |
parent | 61241113169b676b8c8c5989017262de0e9ca9b1 (diff) | |
download | meta-openembedded-contrib-4f3b378e6a618b6a0735f8096b49f166bf7c2a80.tar.gz |
pcsc-lite: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb | 9 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb index bc51f72c5f..04ec03c9a8 100644 --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb @@ -8,7 +8,9 @@ SRC_URI = "https://alioth.debian.org/frs/download.php/3757/pcsc-lite-${PV}.tar.b SRC_URI[md5sum] = "3e4b777231d35ce35c15c0704f936eaa" SRC_URI[sha256sum] = "1e44049168d1ce55fd56c175f61206955254df0f385455f2a20ec7e8a0e6a77a" -inherit autotools +PR = "r3" + +inherit autotools systemd EXTRA_OECONF = " \ --disable-libusb \ @@ -23,3 +25,8 @@ PACKAGES =+ "${PN}-lib" RRECOMMENDS_${PN} = "ccid" FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "pcscd.socket" diff --git a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend b/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend deleted file mode 100644 index f8778015a2..0000000000 --- a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -inherit systemd - -PRINC := "${@int(PRINC) + 2}" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "pcscd.socket" |