diff options
| author | Khem Raj <raj.khem@gmail.com> | 2013-02-13 17:25:35 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-12 18:49:55 +0200 |
| commit | 313f0ae25925caead4f588695ac9c9bcf00b2755 (patch) | |
| tree | 1c167bd3cecfa253e438fefd045db110e2fa4cad /meta-systemd/meta-oe/recipes-support | |
| parent | 0afa2a51d2720ed1d6c06aaef17bd90248ef650e (diff) | |
| download | meta-openembedded-313f0ae25925caead4f588695ac9c9bcf00b2755.tar.gz | |
meta-systemd: Append ${PN} to SYSTEMD_SERVICE
When using systemd class from OE-Core we also need
to install the units explicitly.
systemd packages ending with -systemd are consumed
and now provided by package proper.
MJ: fix RPROVIDES_PN = PN-systemd in entrance
MJ: add RPROVIDES for ntp*-systemd in ntp
MJ: the same for wpa-supplicant
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd/meta-oe/recipes-support')
4 files changed, 12 insertions, 8 deletions
diff --git a/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend b/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend index 92c2e77e6c..95e2f7a493 100644 --- a/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend +++ b/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend | |||
| @@ -7,5 +7,6 @@ EXTRA_OECONF += " \ | |||
| 7 | --with-systemdsystemunitdir=${systemd_unitdir}/system \ | 7 | --with-systemdsystemunitdir=${systemd_unitdir}/system \ |
| 8 | " | 8 | " |
| 9 | 9 | ||
| 10 | SYSTEMD_PACKAGES = "${PN}-systemd" | 10 | SYSTEMD_PACKAGES = "${PN}" |
| 11 | SYSTEMD_SERVICE = "${PN}.service" | 11 | RPROVIDES_${PN} += "${PN}-systemd" |
| 12 | SYSTEMD_SERVICE_${PN} = "${PN}.service" | ||
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 index b8150b7f76..74e5ae82db 100644 --- 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 | |||
| @@ -2,5 +2,6 @@ inherit systemd | |||
| 2 | 2 | ||
| 3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 1}" |
| 4 | 4 | ||
| 5 | SYSTEMD_PACKAGES = "${PN}-systemd" | 5 | SYSTEMD_PACKAGES = "${PN}" |
| 6 | SYSTEMD_SERVICE = "pcscd.socket" | 6 | RPROVIDES_${PN} += "${PN}-systemd" |
| 7 | SYSTEMD_SERVICE_${PN} = "pcscd.socket" | ||
diff --git a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend index a60a109afd..5334fff1ff 100644 --- a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend +++ b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend | |||
| @@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}" | |||
| 4 | 4 | ||
| 5 | SYSTEMD_UNITDIR = "${systemd_unitdir}/system" | 5 | SYSTEMD_UNITDIR = "${systemd_unitdir}/system" |
| 6 | 6 | ||
| 7 | SYSTEMD_PACKAGES = "${PN}-systemd" | 7 | SYSTEMD_PACKAGES = "${PN}" |
| 8 | SYSTEMD_SERVICE = "${PN}.service" | 8 | RPROVIDES_${PN} += "${PN}-systemd" |
| 9 | SYSTEMD_SERVICE_${PN} = "${PN}.service" | ||
diff --git a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend index 9d0f18c7a0..87eb3bb914 100644 --- a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend +++ b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend | |||
| @@ -9,6 +9,7 @@ DEPENDS += "systemd" | |||
| 9 | 9 | ||
| 10 | SRC_URI += "file://add-systemd-support.patch" | 10 | SRC_URI += "file://add-systemd-support.patch" |
| 11 | 11 | ||
| 12 | SYSTEMD_PACKAGES = "${PN}-systemd" | 12 | SYSTEMD_PACKAGES = "${PN}" |
| 13 | SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service" | 13 | RPROVIDES_${PN} += "${PN}-systemd" |
| 14 | SYSTEMD_SERVICE_${PN} = "udisks-daemon.service" | ||
| 14 | SYSTEMD_AUTO_ENABLE = "disable" | 15 | SYSTEMD_AUTO_ENABLE = "disable" |