summaryrefslogtreecommitdiffstats
path: root/meta-systemd
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-12 13:19:14 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-12 18:50:15 +0200
commita179ca25a4223bab312d2717fce63a7b160dc769 (patch)
treed064b0f402e470cdf1cf0115cc1cec7a63c31839 /meta-systemd
parent313f0ae25925caead4f588695ac9c9bcf00b2755 (diff)
downloadmeta-openembedded-a179ca25a4223bab312d2717fce63a7b160dc769.tar.gz
meta-systemd: drop default SYSTEMD_PACKAGES = "${PN}"
Diffstat (limited to 'meta-systemd')
-rw-r--r--meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend1
-rw-r--r--meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend1
-rw-r--r--meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend1
-rw-r--r--meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend1
-rw-r--r--meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.9.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend1
-rw-r--r--meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend1
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend1
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend1
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend1
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend1
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend1
-rw-r--r--meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend1
-rw-r--r--meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend1
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb1
31 files changed, 0 insertions, 31 deletions
diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
index 6ea753df0..e02e69886 100644
--- a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
+++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
@@ -14,6 +14,5 @@ do_install_append() {
14 > ${D}${systemd_unitdir}/system/gdm.service 14 > ${D}${systemd_unitdir}/system/gdm.service
15} 15}
16 16
17SYSTEMD_PACKAGES = "${PN}"
18RPROVIDES_${PN} += "${PN}-systemd" 17RPROVIDES_${PN} += "${PN}-systemd"
19SYSTEMD_SERVICE_${PN} = "gdm.service" 18SYSTEMD_SERVICE_${PN} = "gdm.service"
diff --git a/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend b/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend
index e19723ae1..be801c91a 100644
--- a/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend
+++ b/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend
@@ -10,6 +10,5 @@ do_install_append() {
10 ${D}/${systemd_unitdir}/system/mpd.service 10 ${D}/${systemd_unitdir}/system/mpd.service
11} 11}
12 12
13SYSTEMD_PACKAGES = "${PN}"
14RPROVIDES_${PN} += "${PN}-systemd" 13RPROVIDES_${PN} += "${PN}-systemd"
15SYSTEMD_SERVICE_${PN} = "mpd.service" 14SYSTEMD_SERVICE_${PN} = "mpd.service"
diff --git a/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend b/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend
index f6792f13d..708b7b2c3 100644
--- a/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend
+++ b/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend
@@ -2,6 +2,5 @@ inherit systemd
2 2
3PRINC := "${@int(PRINC) + 1}" 3PRINC := "${@int(PRINC) + 1}"
4 4
5SYSTEMD_PACKAGES = "${PN}"
6RPROVIDES_${PN} += "${PN}-systemd" 5RPROVIDES_${PN} += "${PN}-systemd"
7SYSTEMD_SERVICE_${PN} = "autofs.service" 6SYSTEMD_SERVICE_${PN} = "autofs.service"
diff --git a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend b/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
index 76dd4bae7..410ad3a99 100644
--- a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
+++ b/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
@@ -7,7 +7,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
7 7
8SRC_URI += "file://domainname.service" 8SRC_URI += "file://domainname.service"
9 9
10SYSTEMD_PACKAGES = "${PN}"
11RPROVIDES_${PN} += "${PN}-systemd" 10RPROVIDES_${PN} += "${PN}-systemd"
12SYSTEMD_SERVICE_${PN} = "domainname.service" 11SYSTEMD_SERVICE_${PN} = "domainname.service"
13 12
diff --git a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend b/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend
index cd3b98e3c..23a9c99d2 100644
--- a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend
+++ b/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend
@@ -7,7 +7,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
7 7
8SRC_URI += "file://ypbind.service" 8SRC_URI += "file://ypbind.service"
9 9
10SYSTEMD_PACKAGES = "${PN}"
11RPROVIDES_${PN} += "${PN}-systemd" 10RPROVIDES_${PN} += "${PN}-systemd"
12SYSTEMD_SERVICE_${PN} = "ypbind.service" 11SYSTEMD_SERVICE_${PN} = "ypbind.service"
13do_install_append() { 12do_install_append() {
diff --git a/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
index c8d0d3d6c..7dfd28532 100644
--- a/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
+++ b/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
@@ -4,7 +4,6 @@ PRINC := "${@int(PRINC) + 6}"
4SRC_URI += " file://keymaps.service" 4SRC_URI += " file://keymaps.service"
5 5
6inherit systemd 6inherit systemd
7SYSTEMD_PACKAGES = "${PN}"
8RPROVIDES_${PN} += "${PN}-systemd" 7RPROVIDES_${PN} += "${PN}-systemd"
9SYSTEMD_SERVICE_${PN} = "${PN}.service" 8SYSTEMD_SERVICE_${PN} = "${PN}.service"
10 9
diff --git a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
index c8571b743..38ef27242 100644
--- a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
+++ b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
@@ -6,7 +6,6 @@ inherit systemd
6 6
7SRC_URI += "file://cherokee.service" 7SRC_URI += "file://cherokee.service"
8 8
9SYSTEMD_PACKAGES = "${PN}"
10RPROVIDES_${PN} += "${PN}-systemd" 9RPROVIDES_${PN} += "${PN}-systemd"
11SYSTEMD_SERVICE_${PN} = "cherokee.service" 10SYSTEMD_SERVICE_${PN} = "cherokee.service"
12 11
diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
index 799b3cdfc..1982243d7 100644
--- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
+++ b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
@@ -6,7 +6,6 @@ inherit systemd
6 6
7SRC_URI += "file://dnsmasq.service" 7SRC_URI += "file://dnsmasq.service"
8 8
9SYSTEMD_PACKAGES = "${PN}"
10RPROVIDES_${PN} += "${PN}-systemd" 9RPROVIDES_${PN} += "${PN}-systemd"
11SYSTEMD_SERVICE_${PN} = "dnsmasq.service" 10SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
12 11
diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
index c46e98180..69ae431dc 100644
--- a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
+++ b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
@@ -9,7 +9,6 @@ SRC_URI += "file://dropbearkey.service \
9 file://dropbear@.service \ 9 file://dropbear@.service \
10 file://dropbear.socket" 10 file://dropbear.socket"
11 11
12SYSTEMD_PACKAGES = "${PN}"
13RPROVIDES_${PN} += "${PN}-systemd" 12RPROVIDES_${PN} += "${PN}-systemd"
14SYSTEMD_SERVICE_${PN} = "dropbear.socket" 13SYSTEMD_SERVICE_${PN} = "dropbear.socket"
15 14
diff --git a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
index 03d878e88..cdcfb184d 100644
--- a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
+++ b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
@@ -9,7 +9,6 @@ SRC_URI += "file://cloud9.service"
9inherit systemd 9inherit systemd
10 10
11NATIVE_SYSTEMD_SUPPORT = "1" 11NATIVE_SYSTEMD_SUPPORT = "1"
12SYSTEMD_PACKAGES = "${PN}"
13RPROVIDES_${PN} += "${PN}-systemd" 12RPROVIDES_${PN} += "${PN}-systemd"
14SYSTEMD_SERVICE_${PN} = "cloud9.service" 13SYSTEMD_SERVICE_${PN} = "cloud9.service"
15do_install_append() { 14do_install_append() {
diff --git a/meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend b/meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend
index 2e63c69e8..33352249d 100644
--- a/meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend
+++ b/meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend
@@ -7,7 +7,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
7 7
8SRC_URI += "file://atd.service" 8SRC_URI += "file://atd.service"
9 9
10SYSTEMD_PACKAGES = "${PN}"
11RPROVIDES_${PN} += "${PN}-systemd" 10RPROVIDES_${PN} += "${PN}-systemd"
12SYSTEMD_SERVICE_${PN} = "atd.service" 11SYSTEMD_SERVICE_${PN} = "atd.service"
13do_install_append() { 12do_install_append() {
diff --git a/meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.9.bbappend b/meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.9.bbappend
index 0ffba654a..418836fc2 100644
--- a/meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.9.bbappend
+++ b/meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.9.bbappend
@@ -5,7 +5,6 @@ PRINC := "${@int(PRINC) + 3}"
5 5
6inherit systemd 6inherit systemd
7 7
8SYSTEMD_PACKAGES = "${PN}"
9RPROVIDES_${PN} += "${PN}-systemd" 8RPROVIDES_${PN} += "${PN}-systemd"
10SYSTEMD_SERVICE_${PN} = "crond.service" 9SYSTEMD_SERVICE_${PN} = "crond.service"
11 10
diff --git a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend b/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
index fb31f9234..9600c65bc 100644
--- a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
+++ b/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
@@ -7,7 +7,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
7 7
8SRC_URI += "file://rpcbind.service" 8SRC_URI += "file://rpcbind.service"
9 9
10SYSTEMD_PACKAGES = "${PN}"
11RPROVIDES_${PN} += "${PN}-systemd" 10RPROVIDES_${PN} += "${PN}-systemd"
12SYSTEMD_SERVICE_${PN} = "rpcbind.service" 11SYSTEMD_SERVICE_${PN} = "rpcbind.service"
13 12
diff --git a/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend b/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
index 85d99ed72..70b366628 100644
--- a/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
+++ b/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
@@ -6,6 +6,5 @@ DEPENDS += "systemd"
6 6
7SYSTEMD_UNITDIR = "${systemd_unitdir}/system" 7SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
8 8
9SYSTEMD_PACKAGES = "${PN}"
10RPROVIDES_${PN} += "${PN}-systemd" 9RPROVIDES_${PN} += "${PN}-systemd"
11SYSTEMD_SERVICE_${PN} = "${PN}.service" 10SYSTEMD_SERVICE_${PN} = "${PN}.service"
diff --git a/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend b/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend
index 34b82f72f..96ae94c1b 100644
--- a/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend
+++ b/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend
@@ -8,7 +8,6 @@ SRC_URI += " \
8 file://zram.service \ 8 file://zram.service \
9" 9"
10 10
11SYSTEMD_PACKAGES = "${PN}"
12RPROVIDES_${PN} += "${PN}-systemd" 11RPROVIDES_${PN} += "${PN}-systemd"
13SYSTEMD_SERVICE_${PN} = "zram.service" 12SYSTEMD_SERVICE_${PN} = "zram.service"
14 13
diff --git a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
index 6fe4b9fac..fcb73aff5 100644
--- a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
+++ b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
@@ -4,6 +4,5 @@ PRINC := "${@int(PRINC) + 1}"
4inherit systemd 4inherit systemd
5 5
6SYSTEMD_UNITDIR = "${systemd_unitdir}/system" 6SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
7SYSTEMD_PACKAGES = "${PN}"
8RPROVIDES_${PN} += "${PN}-systemd" 7RPROVIDES_${PN} += "${PN}-systemd"
9SYSTEMD_SERVICE_${PN} = "lxdm.service" 8SYSTEMD_SERVICE_${PN} = "lxdm.service"
diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
index 5f829acf0..e1eccf67f 100644
--- a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
+++ b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
@@ -6,7 +6,6 @@ inherit systemd
6 6
7SRC_URI += "file://xinput-calibrator.service" 7SRC_URI += "file://xinput-calibrator.service"
8 8
9SYSTEMD_PACKAGES = "${PN}"
10RPROVIDES_${PN} += "${PN}-systemd" 9RPROVIDES_${PN} += "${PN}-systemd"
11SYSTEMD_SERVICE_${PN} = "${PN}.service" 10SYSTEMD_SERVICE_${PN} = "${PN}.service"
12 11
diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
index 931051387..ee2009a4f 100644
--- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
+++ b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
@@ -15,7 +15,6 @@ do_install_append() {
15 install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system 15 install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system
16} 16}
17 17
18SYSTEMD_PACKAGES = "${PN}"
19RPROVIDES_${PN} += "${PN}-systemd" 18RPROVIDES_${PN} += "${PN}-systemd"
20SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" 19SYSTEMD_SERVICE_${PN} = "xserver-nodm.service"
21 20
diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend
index 23e0bc318..353ced85a 100644
--- a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend
+++ b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend
@@ -6,7 +6,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
6 6
7SRC_URI += "file://gpsd.service" 7SRC_URI += "file://gpsd.service"
8 8
9SYSTEMD_PACKAGES = "${PN}"
10RPROVIDES_${PN} += "${PN}-systemd" 9RPROVIDES_${PN} += "${PN}-systemd"
11SYSTEMD_SERVICE_${PN} = "${PN}.socket" 10SYSTEMD_SERVICE_${PN} = "${PN}.socket"
12SYSTEMD_OESCONS = "true" 11SYSTEMD_OESCONS = "true"
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 95e2f7a49..230a5832f 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,6 +7,5 @@ EXTRA_OECONF += " \
7 --with-systemdsystemunitdir=${systemd_unitdir}/system \ 7 --with-systemdsystemunitdir=${systemd_unitdir}/system \
8" 8"
9 9
10SYSTEMD_PACKAGES = "${PN}"
11RPROVIDES_${PN} += "${PN}-systemd" 10RPROVIDES_${PN} += "${PN}-systemd"
12SYSTEMD_SERVICE_${PN} = "${PN}.service" 11SYSTEMD_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 74e5ae82d..91e5e3f65 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,6 +2,5 @@ inherit systemd
2 2
3PRINC := "${@int(PRINC) + 1}" 3PRINC := "${@int(PRINC) + 1}"
4 4
5SYSTEMD_PACKAGES = "${PN}"
6RPROVIDES_${PN} += "${PN}-systemd" 5RPROVIDES_${PN} += "${PN}-systemd"
7SYSTEMD_SERVICE_${PN} = "pcscd.socket" 6SYSTEMD_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 5334fff1f..45b7e26bf 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,6 +4,5 @@ PRINC := "${@int(PRINC) + 1}"
4 4
5SYSTEMD_UNITDIR = "${systemd_unitdir}/system" 5SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
6 6
7SYSTEMD_PACKAGES = "${PN}"
8RPROVIDES_${PN} += "${PN}-systemd" 7RPROVIDES_${PN} += "${PN}-systemd"
9SYSTEMD_SERVICE_${PN} = "${PN}.service" 8SYSTEMD_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 87eb3bb91..5dc6f426b 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,7 +9,6 @@ DEPENDS += "systemd"
9 9
10SRC_URI += "file://add-systemd-support.patch" 10SRC_URI += "file://add-systemd-support.patch"
11 11
12SYSTEMD_PACKAGES = "${PN}"
13RPROVIDES_${PN} += "${PN}-systemd" 12RPROVIDES_${PN} += "${PN}-systemd"
14SYSTEMD_SERVICE_${PN} = "udisks-daemon.service" 13SYSTEMD_SERVICE_${PN} = "udisks-daemon.service"
15SYSTEMD_AUTO_ENABLE = "disable" 14SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
index ec0f08d93..987c510c3 100644
--- a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
@@ -2,7 +2,6 @@ PRINC := "${@int(PRINC) + 1}"
2 2
3inherit systemd 3inherit systemd
4 4
5SYSTEMD_PACKAGES = "${PN}"
6RPROVIDES_${PN} += "${PN}-systemd" 5RPROVIDES_${PN} += "${PN}-systemd"
7SYSTEMD_SERVICE_${PN} = "avahi-daemon.service" 6SYSTEMD_SERVICE_${PN} = "avahi-daemon.service"
8SYSTEMD_AUTO_ENABLE = "enable" 7SYSTEMD_AUTO_ENABLE = "enable"
diff --git a/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend b/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend
index 004c4945a..e4dcabb3f 100644
--- a/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend
@@ -4,7 +4,6 @@ inherit systemd
4 4
5EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/" 5EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/"
6 6
7SYSTEMD_PACKAGES = "${PN}"
8RPROVIDES_${PN} += "${PN}-systemd" 7RPROVIDES_${PN} += "${PN}-systemd"
9SYSTEMD_SERVICE_${PN} = "bluetooth.service" 8SYSTEMD_SERVICE_${PN} = "bluetooth.service"
10SYSTEMD_AUTO_ENABLE = "disable" 9SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend b/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend
index 37c0d2919..0ba99b5d8 100644
--- a/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend
@@ -1,5 +1,4 @@
1PRINC := "${@int(PRINC) + 1}" 1PRINC := "${@int(PRINC) + 1}"
2 2
3SYSTEMD_PACKAGES = "${PN}"
4RPROVIDES_${PN} += "${PN}-systemd" 3RPROVIDES_${PN} += "${PN}-systemd"
5SYSTEMD_SERVICE_${PN} = "connman.service" 4SYSTEMD_SERVICE_${PN} = "connman.service"
diff --git a/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend b/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend
index 992370801..e0e8f2829 100644
--- a/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend
@@ -2,7 +2,6 @@ PRINC := "${@int(PRINC) + 1}"
2 2
3inherit systemd 3inherit systemd
4 4
5SYSTEMD_PACKAGES = "${PN}"
6RPROVIDES_${PN} += "${PN}-systemd" 5RPROVIDES_${PN} += "${PN}-systemd"
7SYSTEMD_SERVICE_${PN} = "ofono.service" 6SYSTEMD_SERVICE_${PN} = "ofono.service"
8SYSTEMD_AUTO_ENABLE = "disable" 7SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
index 281c44043..73709e8a6 100644
--- a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
@@ -4,7 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
4 4
5inherit systemd 5inherit systemd
6 6
7SYSTEMD_PACKAGES = "${PN}"
8RPROVIDES_${PN} += "${PN}-systemd" 7RPROVIDES_${PN} += "${PN}-systemd"
9SYSTEMD_SERVICE_${PN} = "portmap.service" 8SYSTEMD_SERVICE_${PN} = "portmap.service"
10SYSTEMD_AUTO_ENABLE = "disable" 9SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
index e0b1abaf7..0447f511b 100644
--- a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
+++ b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
@@ -4,6 +4,5 @@ PRINC := "${@int(PRINC) + 1}"
4 4
5SYSTEMD_UNITDIR = "${systemd_unitdir}/system" 5SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
6EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}" 6EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
7SYSTEMD_PACKAGES = "${PN}"
8RPROVIDES_${PN} += "${PN}-systemd" 7RPROVIDES_${PN} += "${PN}-systemd"
9SYSTEMD_SERVICE_${PN} = "uuidd.socket" 8SYSTEMD_SERVICE_${PN} = "uuidd.socket"
diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
index 89079dcae..0c7548a86 100644
--- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
+++ b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
@@ -6,7 +6,6 @@ inherit systemd
6 6
7SRC_URI += "file://lighttpd.service" 7SRC_URI += "file://lighttpd.service"
8 8
9SYSTEMD_PACKAGES = "${PN}"
10RPROVIDES_${PN} += "${PN}-systemd" 9RPROVIDES_${PN} += "${PN}-systemd"
11SYSTEMD_SERVICE_${PN} = "lighttpd.service" 10SYSTEMD_SERVICE_${PN} = "lighttpd.service"
12 11
diff --git a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb
index 3b3c1dcac..9512986f8 100644
--- a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb
+++ b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb
@@ -9,6 +9,5 @@ PR = "r1"
9 9
10inherit systemd 10inherit systemd
11SYSTEMD_SERVICE_${PN} = "" 11SYSTEMD_SERVICE_${PN} = ""
12SYSTEMD_PACKAGES = "${PN}"
13NATIVE_SYSTEMD_SUPPORT = "1" 12NATIVE_SYSTEMD_SUPPORT = "1"
14ALLOW_EMPTY_${PN} = "1" 13ALLOW_EMPTY_${PN} = "1"