summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 15:00:36 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:05 +0200
commit4f3b378e6a618b6a0735f8096b49f166bf7c2a80 (patch)
treee6b763f448d116c83cd6f5961da62567eb68fca1
parent61241113169b676b8c8c5989017262de0e9ca9b1 (diff)
downloadmeta-openembedded-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.bb9
-rw-r--r--meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend8
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 bc51f72c5..04ec03c9a 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
8SRC_URI[md5sum] = "3e4b777231d35ce35c15c0704f936eaa" 8SRC_URI[md5sum] = "3e4b777231d35ce35c15c0704f936eaa"
9SRC_URI[sha256sum] = "1e44049168d1ce55fd56c175f61206955254df0f385455f2a20ec7e8a0e6a77a" 9SRC_URI[sha256sum] = "1e44049168d1ce55fd56c175f61206955254df0f385455f2a20ec7e8a0e6a77a"
10 10
11inherit autotools 11PR = "r3"
12
13inherit autotools systemd
12 14
13EXTRA_OECONF = " \ 15EXTRA_OECONF = " \
14 --disable-libusb \ 16 --disable-libusb \
@@ -23,3 +25,8 @@ PACKAGES =+ "${PN}-lib"
23RRECOMMENDS_${PN} = "ccid" 25RRECOMMENDS_${PN} = "ccid"
24 26
25FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}" 27FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
28
29RPROVIDES_${PN} += "${PN}-systemd"
30RREPLACES_${PN} += "${PN}-systemd"
31RCONFLICTS_${PN} += "${PN}-systemd"
32SYSTEMD_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 f8778015a..000000000
--- a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
1inherit systemd
2
3PRINC := "${@int(PRINC) + 2}"
4
5RPROVIDES_${PN} += "${PN}-systemd"
6RREPLACES_${PN} += "${PN}-systemd"
7RCONFLICTS_${PN} += "${PN}-systemd"
8SYSTEMD_SERVICE_${PN} = "pcscd.socket"