Skip to contentSkip to conversation

Delete systemd class.

PATCH In review Khem Raj 6 participants 22 messages Feb 13, 2013 – Apr 13, 2013

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 Delete systemd class.

---
 meta-systemd/classes/systemd.bbclass |  225 ----------------------------------
 1 file changed, 225 deletions(-)
 delete mode 100644 meta-systemd/classes/systemd.bbclass
meta-systemd/classes/systemd.bbclass deleted +0 -225
deleted file mode 100644
index f2a0363..0000000
@@ -1,225 +0,0 @@
-DEPENDS_append = " systemd-systemctl-native"
-
-SYSTEMD_AUTO_ENABLE ??= "enable"
-
-SYSTEMD_AUTO_RRECOMMENDS ??= "enable"
-
-systemd_postinst() {
-OPTS=""
-
-if [ -n "$D" ]; then
-    OPTS="--root=$D"
-fi
-
-systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
-
-if [ -z "$D" -a ${SYSTEMD_AUTO_ENABLE} = "enable" ]; then
-    systemctl start ${SYSTEMD_SERVICE}
-fi
-}
-
-systemd_prerm() {
-if [ -z "$D" ]; then
-    systemctl stop ${SYSTEMD_SERVICE}
-fi
-
-systemctl disable ${SYSTEMD_SERVICE}
-}
-
-def get_package_var(d, var, pkg):
-    val = (d.getVar('%s_%s' % (var, pkg), 1) or "").strip()
-    if val == "":
-        val = (d.getVar(var, 1) or "").strip()
-    return val
-
-def systemd_after_parse(d):
-    def systemd_check_vars():
-        if d.getVar('BB_WORKERCONTEXT', True) is not None:
-            return
-
-        bb_filename = d.getVar('FILE')
-        packages = d.getVar('PACKAGES', 1)
-
-        # check SYSTEMD_PACKAGES
-        systemd_pkgs = d.getVar('SYSTEMD_PACKAGES', 1) or ""
-        if systemd_pkgs == "":
-            raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_PACKAGES" % bb_filename
-        for pkg_systemd in systemd_pkgs.split():
-            if pkg_systemd.find("-systemd") == -1:
-                if pkg_systemd != d.getVar('PN', 1):
-                    raise bb.build.FuncFailed, \
-                        "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
-                        (bb_filename, pkg_systemd)
-            else:
-                pkg_systemd_base = pkg_systemd
-                if pkg_systemd_base.endswith('-systemd'):
-                    pkg_systemd_base = pkg_systemd[:-8]
-                if pkg_systemd_base not in packages:
-                    raise bb.build.FuncFailed, \
-                        "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
-                        ( bb_filename, pkg_systemd)
-
-    # prepend systemd-packages not already included
-    def systemd_create_package(pkg_systemd):
-        packages = d.getVar('PACKAGES', 1)
-        if not pkg_systemd in packages:
-            packages = "%s %s" % (pkg_systemd, packages)
-            d.setVar('PACKAGES', packages)
-
-
-    bpn = d.getVar('BPN', 1)
-    ml = d.getVar('MLPREFIX', 1) or ""
-    if bpn + "-native" != d.getVar('PN', 1) and \
-            bpn + "-cross" != d.getVar('PN', 1) and \
-            ml + bpn == d.getVar('PN', 1) and \
-            "nativesdk-" + bpn != d.getVar('PN', 1):
-        systemd_check_vars()
-        for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
-            systemd_create_package(pkg_systemd)
-
-
-python __anonymous() {
-    systemd_after_parse(d)
-}
-
-# automatically install all *.service and *.socket supplied in recipe's SRC_URI
-do_install_append() {
-    for service in `find ${WORKDIR} -maxdepth 1 -name '*.service' -o -name '*.socket'` ; do
-    # ensure installing systemd-files only (e.g not avahi *.service)
-    if grep -q '\[Unit\]' $service ; then
-        install -d ${D}${systemd_unitdir}/system
-        install -m 644 $service ${D}${systemd_unitdir}/system
-    fi
-    done
-}
-
-python populate_packages_prepend () {
-    def systemd_generate_package_scripts(pkg):
-        bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % pkg)
-        localdata = d.createCopy()
-        overrides = localdata.getVar("OVERRIDES", 1)
-        localdata.setVar("OVERRIDES", "%s:%s" % (pkg, overrides))
-        bb.data.update_data(localdata)
-
-        """
-        systemd postinst is appended here because pkg_postinst may require to
-        execute on the target. Not doing so may cause systemd postinst invoked
-        twice to cause unwanted warnings.
-        """ 
-        postinst = localdata.getVar('pkg_postinst', 1)
-        if not postinst:
-            postinst = '#!/bin/sh\n'
-        postinst += localdata.getVar('systemd_postinst', 1)
-        d.setVar('pkg_postinst_%s' % pkg, postinst)
-
-        prerm = localdata.getVar('pkg_prerm', 1)
-        if not prerm:
-            prerm = '#!/bin/sh\n'
-        prerm += localdata.getVar('systemd_prerm', 1)
-        d.setVar('pkg_prerm_%s' % pkg, prerm)
-
-    # add files to FILES_*-systemd if existent and not already done
-    def systemd_append_file(pkg_systemd, file_append):
-        appended = False
-        if os.path.exists('${D}' + file_append):
-            var_name = "FILES_" + pkg_systemd
-            files = d.getVar(var_name, 0) or ""
-            if file_append not in files.split():
-                d.setVar(var_name, "%s %s" % (files, file_append))
-                appended = True
-        return appended
-
-    # add systemd files to FILES_*-systemd, parse for Also= and follow recursive
-    def systemd_add_files_and_parse(pkg_systemd, path, service, keys):
-        # avoid infinite recursion
-        if systemd_append_file(pkg_systemd, path + service):
-            fullpath = '${D}' + path + service
-            if service.find('.socket') != -1:
-                # for *.socket add *.service and *@.service
-                service_base = service.replace('.socket', '')
-                systemd_add_files_and_parse(pkg_systemd, path, service_base + '.service', keys)
-                systemd_add_files_and_parse(pkg_systemd, path, service_base + '@.service', keys)
-            for key in keys.split():
-                # recurse all dependencies found in keys ('Also';'Conflicts';..) and add to files
-                cmd = "grep %s %s | sed 's,%s=,,g' | tr ',' '\\n'" % (key, fullpath, key)
-                pipe = os.popen(cmd, 'r')
-                line = pipe.readline()
-                while line:
-                    line = line.replace('\n', '')
-                    systemd_add_files_and_parse(pkg_systemd, path, line, keys)
-                    line = pipe.readline()
-                pipe.close()
-
-    # check service-files and call systemd_add_files_and_parse for each entry
-    def systemd_check_services():
-        base_libdir = d.getVar('base_libdir', 1)
-        searchpaths = '/etc/systemd/system/' + ' '
-        searchpaths += '/lib/systemd/system/' + ' '
-        searchpaths += '/usr/lib/systemd/system/' + ' '
-        systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1)
-        has_exactly_one_service = len(systemd_packages.split()) == 1
-        if has_exactly_one_service:
-            has_exactly_one_service = len(get_package_var(d, 'SYSTEMD_SERVICE', systemd_packages).split()) == 1
-
-        keys = 'Also' # Conflicts??
-        if has_exactly_one_service:
-            # single service gets also the /dev/null dummies
-            keys = 'Also Conflicts'
-        # scan for all in SYSTEMD_SERVICE[]
-        for pkg_systemd in systemd_packages.split():
-            for service in get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd).split():
-                path_found = ''
-                for path in searchpaths.split():
-                    if os.path.exists('${D}' + path + service):
-                        path_found = path
-                if path_found != '':
-                    systemd_add_files_and_parse(pkg_systemd, path_found, service, keys)
-                else:
-                    raise bb.build.FuncFailed, "\n\nFor package %s SYSTEMD_SERVICE-entry %s does not exist" % \
-                        (pkg_systemd, service)
-
-    """     Setup rdepends / rrecommmends as:
-
-                -----------------------------
-                |  pkg_systemd_base: 'foo'  |
-                -----------------------------
-                           |    ^
-                           |    |                 --------------
-               rrecommends |    | rdepends        | 'systemd'  |
-                           |    |               ->--------------
-                           V    |              / rdepends
-                ------------------------------/
-                | pkg_systemd: 'foo-systemd' |
-                ------------------------------
-    """
-    def systemd_add_rdepends_rrecommends(pkg_systemd):
-        # RDEPENDS_${pkg_systemd} += pkg_systemd_base systemd
-        rdepends = d.getVar('RDEPENDS_' + pkg_systemd, 1) or ""
-        rdepends_arr = rdepends.split()
-        if not 'systemd' in rdepends_arr:
-            rdepends = '%s %s' % (rdepends, 'systemd')
-        pkg_systemd_base = pkg_systemd.replace('-systemd', '')
-        # no automatism for:
-        # recipes setting rdepends themselves AND
-        # not rdepending myself AND
-        # avoid double entries
-        if len(rdepends_arr) == 0 and pkg_systemd != '${PN}' and not pkg_systemd_base in rdepends:
-            rdepends = '%s %s' % (rdepends, pkg_systemd_base)
-        d.setVar('RDEPENDS_' + pkg_systemd, rdepends)
-        auto_rrecommends = d.getVar('SYSTEMD_AUTO_RRECOMMENDS', 1) or 'enable'
-        if auto_rrecommends == 'enable':
-            # RRECOMMENDS_${pkg_systemd_base} += pkg_systemd systemd
-            rrecommends = d.getVar('RRECOMMENDS_' + pkg_systemd_base, 1) or ""
-            # not rrecommending myself AND avoid double entries
-            if pkg_systemd != pkg_systemd_base and not pkg_systemd in rrecommends.split():
-                rrecommends = '%s %s' % (rrecommends, pkg_systemd)
-            d.setVar('RRECOMMENDS_' + pkg_systemd_base, rrecommends)
-
-    # run all modifications once when creating package
-    if os.path.exists('${D}'):
-        for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
-            if get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd) != "":
-                systemd_generate_package_scripts(pkg_systemd)
-                systemd_add_rdepends_rrecommends(pkg_systemd)
-        systemd_check_services()
-}
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/2 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.

---
 .../meta-efl/recipes-efl/efl/entrance_svn.bbappend |   16 +++++++++-----
 .../recipes-gnome/gdm/gdm_2.32.2.bbappend          |    5 +++--
 .../recipes-multimedia/musicpd/mpd_0.17.1.bbappend |    5 +++--
 .../recipes-daemons/autofs/autofs_5.0.7.bbappend   |    5 +++--
 .../recipes-support/nis/yp-tools_2.12.bbappend     |   10 +++++++--
 .../recipes-support/nis/ypbind-mt_1.36.bbappend    |   10 ++++++---
 .../recipes-support/ntp/ntp_4.2.6p5.bbappend       |    8 ++++---
 .../recipes-bsp/keymaps/keymaps_1.0.bbappend       |   11 ++++++++--
 .../cherokee/cherokee_1.2.98.bbappend              |   11 ++++++++--
 .../dnsmasq/dnsmasq_2.55.bbappend                  |   11 ++++++++--
 .../gateone/gateone_git.bbappend                   |    9 ++++++--
 .../networkmanager/networkmanager_0.9.2.0.bbappend |    3 +--
 .../recipes-core/busybox/busybox_1.20.2.bbappend   |    6 +++---
 .../dropbear/dropbear_2012.55.bbappend             |    9 ++++++--
 .../recipes-devtools/cloud9/cloud9_0.6.bbappend    |    6 ++++++
 .../meta-oe/recipes-extended/at/at_3.1.13.bbappend |    9 ++++++--
 .../recipes-extended/atftp/atftp_git.bbappend      |   11 ++++++++--
 .../recipes-extended/cronie/cronie_1.4.8.bbappend  |   11 ++++++++--
 .../net-snmp/net-snmp_5.7.1.bbappend               |   13 ++++++++++--
 .../rpcbind/rpcbind_0.2.0.bbappend                 |   10 +++++++--
 .../rsyslog/rsyslog_5.8.0.bbappend                 |    5 +++--
 .../recipes-extended/zram/zram_0.1.bbappend        |   11 ++++++++--
 .../recipes-graphics/lxdm/lxdm_git.bbappend        |    5 +++--
 .../xinput-calibrator_git.bbappend                 |   11 ++++++++--
 .../xserver-nodm-init_2.0.bbappend                 |   11 ++++++----
 .../recipes-navigation/gpsd/gpsd_3.7.bbappend      |    5 +++--
 .../nonworking/syslog-ng/syslog-ng_3.2.5.bbappend  |    5 +++--
 .../pcsc-lite/pcsc-lite_1.8.6.bbappend             |    5 +++--
 .../strongswan/strongswan_5.0.0.bbappend           |    5 +++--
 .../recipes-support/udisks/udisks_1.0.4.bbappend   |    5 +++--
 .../avahi/avahi_0.6.31.bbappend                    |    7 ++++---
 .../bluez/bluez4_4.101.bbappend                    |    5 +++--
 .../connman/connman_1.10.bbappend                  |    5 +++--
 .../recipes-connectivity/dhcp/dhcp_4.2.5.bbappend  |   22 ++++++++++++++++----
 .../recipes-connectivity/ofono/ofono_1.12.bbappend |    5 +++--
 .../openssh/openssh_6.1p1.bbappend                 |   13 ++++++++++--
 .../portmap/portmap_6.0.bbappend                   |   10 +++++++--
 .../util-linux/util-linux_2.22.2.bbappend          |    5 +++--
 .../lighttpd/lighttpd_1.4.32.bbappend              |    7 +++++++
 .../systemd/systemd-machine-units_1.0.bb           |    2 +-
 40 files changed, 242 insertions(+), 86 deletions(-)
meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend +11 -5
index df96e34..89f3565 100644
@@ -1,13 +1,19 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 inherit systemd
 
 SRC_URI += "file://entrance.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "entrance.service"
+RPROVIDES_${PN} += "${PN}"
 
-RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
-RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"
+SYSTEMD_SERVICE_${PN} = "entrance.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system
+}
+
+RCONFLICTS_${PN} += "xserver-nodm-init-systemd"
+RREPLACES_${PN} += "xserver-nodm-init-systemd"
meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend +3 -2
index 45b47c3..6ea753d 100644
@@ -14,5 +14,6 @@ do_install_append() {
 		> ${D}${systemd_unitdir}/system/gdm.service
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "gdm.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "gdm.service"
meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend +3 -2
index eee4cdd..e19723a 100644
@@ -10,5 +10,6 @@ do_install_append() {
         ${D}/${systemd_unitdir}/system/mpd.service
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "mpd.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "mpd.service"
meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend +3 -2
index 3d318fb..f6792f1 100644
@@ -2,5 +2,6 @@ inherit systemd
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "autofs.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "autofs.service"
meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend +8 -2
index 041ca83..76dd4ba 100644
@@ -7,6 +7,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://domainname.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "domainname.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "domainname.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system
+}
 
meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend +7 -3
index 14dbaac..cd3b98e 100644
@@ -7,6 +7,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://ypbind.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "ypbind.service"
-
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "ypbind.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
+}
meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend +5 -3
index c6cd031..4580cf7 100644
@@ -4,9 +4,11 @@ PRINC := "${@int(PRINC) + 1}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_PACKAGES = "${PN}-systemd ntpdate-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service"
-SYSTEMD_SERVICE_ntpdate-systemd = "ntpdate.service"
+SYSTEMD_PACKAGES = "${PN} ntpdate"
+SYSTEMD_SERVICE_${PN} = "ntpd.service"
+SYSTEMD_SERVICE_ntpdate = "ntpdate.service"
+
+FILES_ntpdate += "${systemd_unitdir}/system/ntpdate.service"
 
 SRC_URI += " \
 	file://ntpdate.service \
meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend +9 -2
index 7f336a1..c8d0d3d 100644
@@ -4,5 +4,12 @@ PRINC := "${@int(PRINC) + 6}"
 SRC_URI += " file://keymaps.service"
 
 inherit systemd
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend +9 -2
index 7cc7dd8..c8571b7 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://cherokee.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "cherokee.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "cherokee.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend +9 -2
index 0a9c77e..799b3cd 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://dnsmasq.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "dnsmasq.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend +7 -2
index dd5fea1..489528b 100644
@@ -7,5 +7,10 @@ inherit systemd
 SRC_URI += "file://gateone.service"
 
 NATIVE_SYSTEMD_SUPPORT = "1"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE = "gateone.service"
+SYSTEMD_SERVICE_${PN} = "gateone.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend +1 -2
index 6ae5d75..0510b23 100644
@@ -4,8 +4,7 @@ inherit systemd
 
 DEPENDS += "systemd"
 
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE = "NetworkManager.service"
+SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 
 # NetworkManager-wait-online is not catched by systemd.bbclass
meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend +3 -3
index a0ae2ce..c212104 100644
@@ -8,8 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://busybox-syslog.service.in \
             file://busybox-klogd.service.in"
 
-SYSTEMD_PACKAGES = "${PN}-syslog-systemd"
-SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service"
+SYSTEMD_PACKAGES = "${PN}-syslog"
+SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service"
 
 do_install_append() {
 	install -d ${D}${systemd_unitdir}/system
@@ -20,4 +20,4 @@ do_install_append() {
 
 	ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
 }
-FILES_${PN}-syslog-systemd = "${systemd_unitdir}/system/syslog.service"
+FILES_${PN}-syslog += "${systemd_unitdir}/system/syslog.service"
meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend +7 -2
index 15546e1..c46e981 100644
@@ -9,9 +9,14 @@ SRC_URI += "file://dropbearkey.service \
             file://[email protected] \
             file://dropbear.socket"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "dropbear.socket"
 
 do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/[email protected] ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system
 	ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service
 }
meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend +6 -0
index 777d2f4..dc32172 100644
@@ -10,4 +10,10 @@ inherit systemd
 
 NATIVE_SYSTEMD_SUPPORT = "1"
 SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "cloud9.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend +7 -2
index d80cfff..2e63c69 100644
@@ -7,6 +7,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://atd.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "atd.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "atd.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system
+}
 
meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend +9 -2
index 3706d9f..9707abf 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://atftpd.service"
 
-SYSTEMD_PACKAGES = "atftpd-systemd"
-SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service"
+SYSTEMD_PACKAGES = "atftpd"
+SYSTEMD_SERVICE_atftpd = "atftpd.service"
+FILES_atftpd += "${systemd_unitdir}/system/atftpd.service"
+RPROVIDES_atftpd += "atftpd-systemd"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend +9 -2
index 66db466..0ffba65 100644
@@ -5,7 +5,14 @@ PRINC := "${@int(PRINC) + 3}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "crond.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "crond.service"
 
 SRC_URI += "file://crond.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend +11 -2
index f221c1d..dfe68f2 100644
@@ -9,11 +9,20 @@ SRC_URI += " \
         file://snmpd.service \
         file://snmptrapd.service \
 "
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
+}
 
 EXTRA_OECONF += "--with-systemd"
 
 SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
                     ${PN}-server-snmptrapd-systemd"
 
-SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service"
-SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd =  "snmptrapd.service"
+SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
+SYSTEMD_SERVICE_${PN}-server-snmptrapd =  "snmptrapd.service"
+RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+FILES_${PN}-server-snmpd += "${systemd_unitdir}/system/snmpd.service"
+FILES_${PN}-server-snmptrapd += "${systemd_unitdir}/system/snmptrapd.service"
meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend +8 -2
index 0fa7f97..fb31f92 100644
@@ -7,6 +7,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://rpcbind.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "rpcbind.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+}
 
meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend +3 -2
index b813a50..85d99ed 100644
@@ -6,5 +6,6 @@ DEPENDS += "systemd"
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend +9 -2
index cc98fe1..34b82f7 100644
@@ -8,5 +8,12 @@ SRC_URI += " \
         file://zram.service \
 "
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "zram.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "zram.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend +3 -2
index 2828a70..6fe4b9f 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 inherit systemd
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "lxdm.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "lxdm.service"
meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend +9 -2
index 5bc5bc3..5f829ac 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://xinput-calibrator.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend +7 -4
index b6b77c9..9310513 100644
@@ -10,12 +10,15 @@ SRC_URI += "file://xserver-nodm.service \
 
 do_install_append() {
         install -d ${D}${sysconfdir}/default
+	install -d ${D}${systemd_unitdir}/system
         install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
+	install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "xserver-nodm.service"
 
-FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm"
+FILES_${PN} += "${sysconfdir}/default/xserver-nodm"
 
-RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit"
+RDEPENDS_${PN} += "xserver-common (>= 1.30) xinit"
meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend +3 -2
index 9504761..23e0bc3 100644
@@ -6,8 +6,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://gpsd.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.socket"
 SYSTEMD_OESCONS = "true"
 
 do_install_append() {
meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend +3 -2
index 92c2e77..95e2f7a 100644
@@ -7,5 +7,6 @@ EXTRA_OECONF += " \
   --with-systemdsystemunitdir=${systemd_unitdir}/system \
 "
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend +3 -2
index b8150b7..74e5ae8 100644
@@ -2,5 +2,6 @@ inherit systemd
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "pcscd.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "pcscd.socket"
meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend +3 -2
index a60a109..5334fff 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend +3 -2
index 9d0f18c..87eb3bb 100644
@@ -9,6 +9,7 @@ DEPENDS += "systemd"
 
 SRC_URI += "file://add-systemd-support.patch"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "udisks-daemon.service"
 SYSTEMD_AUTO_ENABLE = "disable"
meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend +4 -3
index d41ca93..ec0f08d 100644
@@ -2,8 +2,9 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "avahi-daemon.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "avahi-daemon.service"
 SYSTEMD_AUTO_ENABLE = "enable"
 
-FILES_${PN}-systemd += "${systemd_unitdir}/system/"
+FILES_${PN} += "${systemd_unitdir}/system/"
meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend +3 -2
index 8945a6d..004c494 100644
@@ -4,6 +4,7 @@ inherit systemd
 
 EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "bluetooth.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "bluetooth.service"
 SYSTEMD_AUTO_ENABLE = "disable"
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.10.bbappend +3 -2
index a9d13e6..dd0469a 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "connman.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "connman.service"
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend +18 -4
index fde2426..aec1dfb 100644
@@ -5,12 +5,26 @@ inherit systemd
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd dhcp-client-systemd"
-SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service"
-SYSTEMD_SERVICE_dhcp-relay-systemd = "dhcrelay.service"
-SYSTEMD_SERVICE_dhcp-client-systemd = "dhclient.service"
+SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client"
+SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
+SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service"
+SYSTEMD_SERVICE_dhcp-client = "dhclient.service"
+
+FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service"
+FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service"
+FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service"
+RPROVIDES_dhcp-server += "dhcp-server-systemd"
+RPROVIDES_dhcp-relay += "dhcp-relay-systemd"
+RPROVIDES_dhcp-client += "dhcp-client-systemd"
 
 SRC_URI += "file://dhcpd.service \
             file://dhclient.service \
             file://dhcrelay.service \
            "
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend +3 -2
index a061b52..9923708 100644
@@ -2,6 +2,7 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "ofono.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "ofono.service"
 SYSTEMD_AUTO_ENABLE = "disable"
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend +11 -2
index a459065..fe5c919 100644
@@ -2,9 +2,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "openssh-sshd-systemd"
-SYSTEMD_SERVICE = "sshd.socket"
+SYSTEMD_PACKAGES = "openssh-sshd"
+SYSTEMD_SERVICE_openssh-sshd = "sshd.socket"
+FILES_openssh-sshd += "${systemd_unitdir}/system/sshd.socket"
+RPROVIDES_openssh-sshd += "openssh-sshd-systemd"
 
 inherit systemd
 
 SRC_URI += "file://sshd.socket file://[email protected] file://sshdgenkeys.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/[email protected] ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend +8 -2
index c0276a3..281c440 100644
@@ -4,8 +4,14 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "portmap.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "portmap.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
 SRC_URI_append = " file://portmap.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend +3 -2
index 809a554..e0b1aba 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "uuidd.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "uuidd.socket"
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend +7 -0
index 0e08358..89079dc 100644
@@ -7,4 +7,11 @@ inherit systemd
 SRC_URI += "file://lighttpd.service"
 
 SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb +1 -1
index f33b2a9..3b3c1dc 100644
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 PR = "r1"
 
 inherit systemd
-SYSTEMD_SERVICE = ""
+SYSTEMD_SERVICE_${PN} = ""
 SYSTEMD_PACKAGES = "${PN}"
 NATIVE_SYSTEMD_SUPPORT = "1"
 ALLOW_EMPTY_${PN} = "1"
Signature · 1 line
1.7.9.5
#2 lore raw

Re: [meta-systemd][PATCH 2/2] meta-systemd: Append ${PN} to SYSTEMD_SERVICE

Quoted 57 lines · Khem Raj

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.

---
 .../meta-efl/recipes-efl/efl/entrance_svn.bbappend |   16 +++++++++-----
 .../recipes-gnome/gdm/gdm_2.32.2.bbappend          |    5 +++--
 .../recipes-multimedia/musicpd/mpd_0.17.1.bbappend |    5 +++--
 .../recipes-daemons/autofs/autofs_5.0.7.bbappend   |    5 +++--
 .../recipes-support/nis/yp-tools_2.12.bbappend     |   10 +++++++--
 .../recipes-support/nis/ypbind-mt_1.36.bbappend    |   10 ++++++---
 .../recipes-support/ntp/ntp_4.2.6p5.bbappend       |    8 ++++---
 .../recipes-bsp/keymaps/keymaps_1.0.bbappend       |   11 ++++++++--
 .../cherokee/cherokee_1.2.98.bbappend              |   11 ++++++++--
 .../dnsmasq/dnsmasq_2.55.bbappend                  |   11 ++++++++--
 .../gateone/gateone_git.bbappend                   |    9 ++++++--
 .../networkmanager/networkmanager_0.9.2.0.bbappend |    3 +--
 .../recipes-core/busybox/busybox_1.20.2.bbappend   |    6 +++---
 .../dropbear/dropbear_2012.55.bbappend             |    9 ++++++--
 .../recipes-devtools/cloud9/cloud9_0.6.bbappend    |    6 ++++++
 .../meta-oe/recipes-extended/at/at_3.1.13.bbappend |    9 ++++++--
 .../recipes-extended/atftp/atftp_git.bbappend      |   11 ++++++++--
 .../recipes-extended/cronie/cronie_1.4.8.bbappend  |   11 ++++++++--
 .../net-snmp/net-snmp_5.7.1.bbappend               |   13 ++++++++++--
 .../rpcbind/rpcbind_0.2.0.bbappend                 |   10 +++++++--
 .../rsyslog/rsyslog_5.8.0.bbappend                 |    5 +++--
 .../recipes-extended/zram/zram_0.1.bbappend        |   11 ++++++++--
 .../recipes-graphics/lxdm/lxdm_git.bbappend        |    5 +++--
 .../xinput-calibrator_git.bbappend                 |   11 ++++++++--
 .../xserver-nodm-init_2.0.bbappend                 |   11 ++++++----
 .../recipes-navigation/gpsd/gpsd_3.7.bbappend      |    5 +++--
 .../nonworking/syslog-ng/syslog-ng_3.2.5.bbappend  |    5 +++--
 .../pcsc-lite/pcsc-lite_1.8.6.bbappend             |    5 +++--
 .../strongswan/strongswan_5.0.0.bbappend           |    5 +++--
 .../recipes-support/udisks/udisks_1.0.4.bbappend   |    5 +++--
 .../avahi/avahi_0.6.31.bbappend                    |    7 ++++---
 .../bluez/bluez4_4.101.bbappend                    |    5 +++--
 .../connman/connman_1.10.bbappend                  |    5 +++--
 .../recipes-connectivity/dhcp/dhcp_4.2.5.bbappend  |   22 ++++++++++++++++----
 .../recipes-connectivity/ofono/ofono_1.12.bbappend |    5 +++--
 .../openssh/openssh_6.1p1.bbappend                 |   13 ++++++++++--
 .../portmap/portmap_6.0.bbappend                   |   10 +++++++--
 .../util-linux/util-linux_2.22.2.bbappend          |    5 +++--
 .../lighttpd/lighttpd_1.4.32.bbappend              |    7 +++++++
 .../systemd/systemd-machine-units_1.0.bb           |    2 +-
 40 files changed, 242 insertions(+), 86 deletions(-)
meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend +0 -0
index df96e34..89f3565 100644
@@ -1,13 +1,19 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 

meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend line 9

Quoted 10 lines
meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend +2 -3
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 inherit systemd
 
 SRC_URI += "file://entrance.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "entrance.service"
+RPROVIDES_${PN} += "${PN}"

This one looks incorrect.

Thanks for doing this! I'll merge it as soon as I can get it built.

Quoted 702 lines
meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend +9 -2
-RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
-RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"
+SYSTEMD_SERVICE_${PN} = "entrance.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system
+}
+
+RCONFLICTS_${PN} += "xserver-nodm-init-systemd"
+RREPLACES_${PN} += "xserver-nodm-init-systemd"
meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend +3 -2
index 45b47c3..6ea753d 100644
@@ -14,5 +14,6 @@ do_install_append() {
 		> ${D}${systemd_unitdir}/system/gdm.service
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "gdm.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "gdm.service"
meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend +3 -2
index eee4cdd..e19723a 100644
@@ -10,5 +10,6 @@ do_install_append() {
         ${D}/${systemd_unitdir}/system/mpd.service
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "mpd.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "mpd.service"
meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend +3 -2
index 3d318fb..f6792f1 100644
@@ -2,5 +2,6 @@ inherit systemd
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "autofs.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "autofs.service"
meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend +8 -2
index 041ca83..76dd4ba 100644
@@ -7,6 +7,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://domainname.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "domainname.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "domainname.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system
+}
 
meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend +7 -3
index 14dbaac..cd3b98e 100644
@@ -7,6 +7,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://ypbind.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "ypbind.service"
-
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "ypbind.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
+}
meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend +5 -3
index c6cd031..4580cf7 100644
@@ -4,9 +4,11 @@ PRINC := "${@int(PRINC) + 1}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_PACKAGES = "${PN}-systemd ntpdate-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service"
-SYSTEMD_SERVICE_ntpdate-systemd = "ntpdate.service"
+SYSTEMD_PACKAGES = "${PN} ntpdate"
+SYSTEMD_SERVICE_${PN} = "ntpd.service"
+SYSTEMD_SERVICE_ntpdate = "ntpdate.service"
+
+FILES_ntpdate += "${systemd_unitdir}/system/ntpdate.service"
 
 SRC_URI += " \
 	file://ntpdate.service \
meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend +9 -2
index 7f336a1..c8d0d3d 100644
@@ -4,5 +4,12 @@ PRINC := "${@int(PRINC) + 6}"
 SRC_URI += " file://keymaps.service"
 
 inherit systemd
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend +9 -2
index 7cc7dd8..c8571b7 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://cherokee.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "cherokee.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "cherokee.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend +9 -2
index 0a9c77e..799b3cd 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://dnsmasq.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "dnsmasq.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend +7 -2
index dd5fea1..489528b 100644
@@ -7,5 +7,10 @@ inherit systemd
 SRC_URI += "file://gateone.service"
 
 NATIVE_SYSTEMD_SUPPORT = "1"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE = "gateone.service"
+SYSTEMD_SERVICE_${PN} = "gateone.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend +1 -2
index 6ae5d75..0510b23 100644
@@ -4,8 +4,7 @@ inherit systemd
 
 DEPENDS += "systemd"
 
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE = "NetworkManager.service"
+SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 
 # NetworkManager-wait-online is not catched by systemd.bbclass
meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend +3 -3
index a0ae2ce..c212104 100644
@@ -8,8 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://busybox-syslog.service.in \
             file://busybox-klogd.service.in"
 
-SYSTEMD_PACKAGES = "${PN}-syslog-systemd"
-SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service"
+SYSTEMD_PACKAGES = "${PN}-syslog"
+SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service"
 
 do_install_append() {
 	install -d ${D}${systemd_unitdir}/system
@@ -20,4 +20,4 @@ do_install_append() {
 
 	ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
 }
-FILES_${PN}-syslog-systemd = "${systemd_unitdir}/system/syslog.service"
+FILES_${PN}-syslog += "${systemd_unitdir}/system/syslog.service"
meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend +7 -2
index 15546e1..c46e981 100644
@@ -9,9 +9,14 @@ SRC_URI += "file://dropbearkey.service \
             file://[email protected] \
             file://dropbear.socket"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "dropbear.socket"
 
 do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/[email protected] ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system
 	ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service
 }
meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend +6 -0
index 777d2f4..dc32172 100644
@@ -10,4 +10,10 @@ inherit systemd
 
 NATIVE_SYSTEMD_SUPPORT = "1"
 SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "cloud9.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend +7 -2
index d80cfff..2e63c69 100644
@@ -7,6 +7,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://atd.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "atd.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "atd.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system
+}
 
meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend +9 -2
index 3706d9f..9707abf 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://atftpd.service"
 
-SYSTEMD_PACKAGES = "atftpd-systemd"
-SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service"
+SYSTEMD_PACKAGES = "atftpd"
+SYSTEMD_SERVICE_atftpd = "atftpd.service"
+FILES_atftpd += "${systemd_unitdir}/system/atftpd.service"
+RPROVIDES_atftpd += "atftpd-systemd"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend +9 -2
index 66db466..0ffba65 100644
@@ -5,7 +5,14 @@ PRINC := "${@int(PRINC) + 3}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "crond.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "crond.service"
 
 SRC_URI += "file://crond.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend +11 -2
index f221c1d..dfe68f2 100644
@@ -9,11 +9,20 @@ SRC_URI += " \
         file://snmpd.service \
         file://snmptrapd.service \
 "
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
+}
 
 EXTRA_OECONF += "--with-systemd"
 
 SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
                     ${PN}-server-snmptrapd-systemd"
 
-SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service"
-SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd =  "snmptrapd.service"
+SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
+SYSTEMD_SERVICE_${PN}-server-snmptrapd =  "snmptrapd.service"
+RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+FILES_${PN}-server-snmpd += "${systemd_unitdir}/system/snmpd.service"
+FILES_${PN}-server-snmptrapd += "${systemd_unitdir}/system/snmptrapd.service"
meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend +8 -2
index 0fa7f97..fb31f92 100644
@@ -7,6 +7,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://rpcbind.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "rpcbind.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+}
 
meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend +3 -2
index b813a50..85d99ed 100644
@@ -6,5 +6,6 @@ DEPENDS += "systemd"
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend +9 -2
index cc98fe1..34b82f7 100644
@@ -8,5 +8,12 @@ SRC_URI += " \
         file://zram.service \
 "
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "zram.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "zram.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend +3 -2
index 2828a70..6fe4b9f 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 inherit systemd
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "lxdm.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "lxdm.service"
meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend +9 -2
index 5bc5bc3..5f829ac 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://xinput-calibrator.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend +7 -4
index b6b77c9..9310513 100644
@@ -10,12 +10,15 @@ SRC_URI += "file://xserver-nodm.service \
 
 do_install_append() {
         install -d ${D}${sysconfdir}/default
+	install -d ${D}${systemd_unitdir}/system
         install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
+	install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "xserver-nodm.service"
 
-FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm"
+FILES_${PN} += "${sysconfdir}/default/xserver-nodm"
 
-RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit"
+RDEPENDS_${PN} += "xserver-common (>= 1.30) xinit"
meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend +3 -2
index 9504761..23e0bc3 100644
@@ -6,8 +6,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://gpsd.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.socket"
 SYSTEMD_OESCONS = "true"
 
 do_install_append() {
meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend +3 -2
index 92c2e77..95e2f7a 100644
@@ -7,5 +7,6 @@ EXTRA_OECONF += " \
   --with-systemdsystemunitdir=${systemd_unitdir}/system \
 "
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend +3 -2
index b8150b7..74e5ae8 100644
@@ -2,5 +2,6 @@ inherit systemd
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "pcscd.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "pcscd.socket"
meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend +3 -2
index a60a109..5334fff 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend +3 -2
index 9d0f18c..87eb3bb 100644
@@ -9,6 +9,7 @@ DEPENDS += "systemd"
 
 SRC_URI += "file://add-systemd-support.patch"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "udisks-daemon.service"
 SYSTEMD_AUTO_ENABLE = "disable"
meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend +4 -3
index d41ca93..ec0f08d 100644
@@ -2,8 +2,9 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "avahi-daemon.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "avahi-daemon.service"
 SYSTEMD_AUTO_ENABLE = "enable"
 
-FILES_${PN}-systemd += "${systemd_unitdir}/system/"
+FILES_${PN} += "${systemd_unitdir}/system/"
meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend +3 -2
index 8945a6d..004c494 100644
@@ -4,6 +4,7 @@ inherit systemd
 
 EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "bluetooth.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "bluetooth.service"
 SYSTEMD_AUTO_ENABLE = "disable"
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.10.bbappend +3 -2
index a9d13e6..dd0469a 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "connman.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "connman.service"
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend +18 -4
index fde2426..aec1dfb 100644
@@ -5,12 +5,26 @@ inherit systemd
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd dhcp-client-systemd"
-SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service"
-SYSTEMD_SERVICE_dhcp-relay-systemd = "dhcrelay.service"
-SYSTEMD_SERVICE_dhcp-client-systemd = "dhclient.service"
+SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client"
+SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
+SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service"
+SYSTEMD_SERVICE_dhcp-client = "dhclient.service"
+
+FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service"
+FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service"
+FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service"
+RPROVIDES_dhcp-server += "dhcp-server-systemd"
+RPROVIDES_dhcp-relay += "dhcp-relay-systemd"
+RPROVIDES_dhcp-client += "dhcp-client-systemd"
 
 SRC_URI += "file://dhcpd.service \
             file://dhclient.service \
             file://dhcrelay.service \
            "
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend +3 -2
index a061b52..9923708 100644
@@ -2,6 +2,7 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "ofono.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "ofono.service"
 SYSTEMD_AUTO_ENABLE = "disable"
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend +11 -2
index a459065..fe5c919 100644
@@ -2,9 +2,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "openssh-sshd-systemd"
-SYSTEMD_SERVICE = "sshd.socket"
+SYSTEMD_PACKAGES = "openssh-sshd"
+SYSTEMD_SERVICE_openssh-sshd = "sshd.socket"
+FILES_openssh-sshd += "${systemd_unitdir}/system/sshd.socket"
+RPROVIDES_openssh-sshd += "openssh-sshd-systemd"
 
 inherit systemd
 
 SRC_URI += "file://sshd.socket file://[email protected] file://sshdgenkeys.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/[email protected] ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend +8 -2
index c0276a3..281c440 100644
@@ -4,8 +4,14 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "portmap.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "portmap.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
 SRC_URI_append = " file://portmap.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend +3 -2
index 809a554..e0b1aba 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "uuidd.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "uuidd.socket"
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend +7 -0
index 0e08358..89079dc 100644
@@ -7,4 +7,11 @@ inherit systemd
 SRC_URI += "file://lighttpd.service"
 
 SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb +1 -1
index f33b2a9..3b3c1dc 100644
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 PR = "r1"
 
 inherit systemd
-SYSTEMD_SERVICE = ""
+SYSTEMD_SERVICE_${PN} = ""
 SYSTEMD_PACKAGES = "${PN}"
 NATIVE_SYSTEMD_SUPPORT = "1"
 ALLOW_EMPTY_${PN} = "1"
Signature · 7 lines
1.7.9.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#3 lore raw

Re: [meta-systemd][PATCH 2/2] meta-systemd: Append ${PN} to SYSTEMD_SERVICE

Quoted 6 lines · Martin Jansa

meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend line 9

Quoted 4 lines
meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend +1 -2
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "entrance.service"
+RPROVIDES_${PN} += "${PN}"

This one looks incorrect.

yes indeed. I have send a V2 with this corrected.

#4 lore raw

Re: [meta-systemd][PATCH 2/2] meta-systemd: Append ${PN} to SYSTEMD_SERVICE

In reply to Khem Raj
Quoted 678 lines · Khem Raj

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.

---
 .../meta-efl/recipes-efl/efl/entrance_svn.bbappend |   16 +++++++++-----
 .../recipes-gnome/gdm/gdm_2.32.2.bbappend          |    5 +++--
 .../recipes-multimedia/musicpd/mpd_0.17.1.bbappend |    5 +++--
 .../recipes-daemons/autofs/autofs_5.0.7.bbappend   |    5 +++--
 .../recipes-support/nis/yp-tools_2.12.bbappend     |   10 +++++++--
 .../recipes-support/nis/ypbind-mt_1.36.bbappend    |   10 ++++++---
 .../recipes-support/ntp/ntp_4.2.6p5.bbappend       |    8 ++++---
 .../recipes-bsp/keymaps/keymaps_1.0.bbappend       |   11 ++++++++--
 .../cherokee/cherokee_1.2.98.bbappend              |   11 ++++++++--
 .../dnsmasq/dnsmasq_2.55.bbappend                  |   11 ++++++++--
 .../gateone/gateone_git.bbappend                   |    9 ++++++--
 .../networkmanager/networkmanager_0.9.2.0.bbappend |    3 +--
 .../recipes-core/busybox/busybox_1.20.2.bbappend   |    6 +++---
 .../dropbear/dropbear_2012.55.bbappend             |    9 ++++++--
 .../recipes-devtools/cloud9/cloud9_0.6.bbappend    |    6 ++++++
 .../meta-oe/recipes-extended/at/at_3.1.13.bbappend |    9 ++++++--
 .../recipes-extended/atftp/atftp_git.bbappend      |   11 ++++++++--
 .../recipes-extended/cronie/cronie_1.4.8.bbappend  |   11 ++++++++--
 .../net-snmp/net-snmp_5.7.1.bbappend               |   13 ++++++++++--
 .../rpcbind/rpcbind_0.2.0.bbappend                 |   10 +++++++--
 .../rsyslog/rsyslog_5.8.0.bbappend                 |    5 +++--
 .../recipes-extended/zram/zram_0.1.bbappend        |   11 ++++++++--
 .../recipes-graphics/lxdm/lxdm_git.bbappend        |    5 +++--
 .../xinput-calibrator_git.bbappend                 |   11 ++++++++--
 .../xserver-nodm-init_2.0.bbappend                 |   11 ++++++----
 .../recipes-navigation/gpsd/gpsd_3.7.bbappend      |    5 +++--
 .../nonworking/syslog-ng/syslog-ng_3.2.5.bbappend  |    5 +++--
 .../pcsc-lite/pcsc-lite_1.8.6.bbappend             |    5 +++--
 .../strongswan/strongswan_5.0.0.bbappend           |    5 +++--
 .../recipes-support/udisks/udisks_1.0.4.bbappend   |    5 +++--
 .../avahi/avahi_0.6.31.bbappend                    |    7 ++++---
 .../bluez/bluez4_4.101.bbappend                    |    5 +++--
 .../connman/connman_1.10.bbappend                  |    5 +++--
 .../recipes-connectivity/dhcp/dhcp_4.2.5.bbappend  |   22 ++++++++++++++++----
 .../recipes-connectivity/ofono/ofono_1.12.bbappend |    5 +++--
 .../openssh/openssh_6.1p1.bbappend                 |   13 ++++++++++--
 .../portmap/portmap_6.0.bbappend                   |   10 +++++++--
 .../util-linux/util-linux_2.22.2.bbappend          |    5 +++--
 .../lighttpd/lighttpd_1.4.32.bbappend              |    7 +++++++
 .../systemd/systemd-machine-units_1.0.bb           |    2 +-
 40 files changed, 242 insertions(+), 86 deletions(-)
meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend +11 -5
index df96e34..89f3565 100644
@@ -1,13 +1,19 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 inherit systemd
 
 SRC_URI += "file://entrance.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "entrance.service"
+RPROVIDES_${PN} += "${PN}"
 
-RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
-RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"
+SYSTEMD_SERVICE_${PN} = "entrance.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system
+}
+
+RCONFLICTS_${PN} += "xserver-nodm-init-systemd"
+RREPLACES_${PN} += "xserver-nodm-init-systemd"
meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend +3 -2
index 45b47c3..6ea753d 100644
@@ -14,5 +14,6 @@ do_install_append() {
 		> ${D}${systemd_unitdir}/system/gdm.service
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "gdm.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "gdm.service"
meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend +3 -2
index eee4cdd..e19723a 100644
@@ -10,5 +10,6 @@ do_install_append() {
         ${D}/${systemd_unitdir}/system/mpd.service
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "mpd.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "mpd.service"
meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend +3 -2
index 3d318fb..f6792f1 100644
@@ -2,5 +2,6 @@ inherit systemd
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "autofs.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "autofs.service"
meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend +8 -2
index 041ca83..76dd4ba 100644
@@ -7,6 +7,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://domainname.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "domainname.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "domainname.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system
+}
 
meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend +7 -3
index 14dbaac..cd3b98e 100644
@@ -7,6 +7,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://ypbind.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "ypbind.service"
-
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "ypbind.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
+}
meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend +5 -3
index c6cd031..4580cf7 100644
@@ -4,9 +4,11 @@ PRINC := "${@int(PRINC) + 1}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_PACKAGES = "${PN}-systemd ntpdate-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service"
-SYSTEMD_SERVICE_ntpdate-systemd = "ntpdate.service"
+SYSTEMD_PACKAGES = "${PN} ntpdate"
+SYSTEMD_SERVICE_${PN} = "ntpd.service"
+SYSTEMD_SERVICE_ntpdate = "ntpdate.service"
+
+FILES_ntpdate += "${systemd_unitdir}/system/ntpdate.service"
 
 SRC_URI += " \
 	file://ntpdate.service \
meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend +9 -2
index 7f336a1..c8d0d3d 100644
@@ -4,5 +4,12 @@ PRINC := "${@int(PRINC) + 6}"
 SRC_URI += " file://keymaps.service"
 
 inherit systemd
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend +9 -2
index 7cc7dd8..c8571b7 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://cherokee.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "cherokee.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "cherokee.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend +9 -2
index 0a9c77e..799b3cd 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://dnsmasq.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "dnsmasq.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend +7 -2
index dd5fea1..489528b 100644
@@ -7,5 +7,10 @@ inherit systemd
 SRC_URI += "file://gateone.service"
 
 NATIVE_SYSTEMD_SUPPORT = "1"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE = "gateone.service"
+SYSTEMD_SERVICE_${PN} = "gateone.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend +1 -2
index 6ae5d75..0510b23 100644
@@ -4,8 +4,7 @@ inherit systemd
 
 DEPENDS += "systemd"
 
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE = "NetworkManager.service"
+SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 
 # NetworkManager-wait-online is not catched by systemd.bbclass
meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend +3 -3
index a0ae2ce..c212104 100644
@@ -8,8 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://busybox-syslog.service.in \
             file://busybox-klogd.service.in"
 
-SYSTEMD_PACKAGES = "${PN}-syslog-systemd"
-SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service"
+SYSTEMD_PACKAGES = "${PN}-syslog"
+SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service"
 
 do_install_append() {
 	install -d ${D}${systemd_unitdir}/system
@@ -20,4 +20,4 @@ do_install_append() {
 
 	ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
 }
-FILES_${PN}-syslog-systemd = "${systemd_unitdir}/system/syslog.service"
+FILES_${PN}-syslog += "${systemd_unitdir}/system/syslog.service"
meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend +7 -2
index 15546e1..c46e981 100644
@@ -9,9 +9,14 @@ SRC_URI += "file://dropbearkey.service \
             file://[email protected] \
             file://dropbear.socket"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "dropbear.socket"
 
 do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/[email protected] ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system
 	ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service
 }
meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend +6 -0
index 777d2f4..dc32172 100644
@@ -10,4 +10,10 @@ inherit systemd
 
 NATIVE_SYSTEMD_SUPPORT = "1"
 SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "cloud9.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend +7 -2
index d80cfff..2e63c69 100644
@@ -7,6 +7,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://atd.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "atd.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "atd.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system
+}
 
meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend +9 -2
index 3706d9f..9707abf 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://atftpd.service"
 
-SYSTEMD_PACKAGES = "atftpd-systemd"
-SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service"
+SYSTEMD_PACKAGES = "atftpd"
+SYSTEMD_SERVICE_atftpd = "atftpd.service"
+FILES_atftpd += "${systemd_unitdir}/system/atftpd.service"
+RPROVIDES_atftpd += "atftpd-systemd"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend +9 -2
index 66db466..0ffba65 100644
@@ -5,7 +5,14 @@ PRINC := "${@int(PRINC) + 3}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "crond.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "crond.service"
 
 SRC_URI += "file://crond.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend +11 -2
index f221c1d..dfe68f2 100644
@@ -9,11 +9,20 @@ SRC_URI += " \
         file://snmpd.service \
         file://snmptrapd.service \
 "
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
+}
 
 EXTRA_OECONF += "--with-systemd"
 
 SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
                     ${PN}-server-snmptrapd-systemd"
 
-SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service"
-SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd =  "snmptrapd.service"
+SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
+SYSTEMD_SERVICE_${PN}-server-snmptrapd =  "snmptrapd.service"
+RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+FILES_${PN}-server-snmpd += "${systemd_unitdir}/system/snmpd.service"
+FILES_${PN}-server-snmptrapd += "${systemd_unitdir}/system/snmptrapd.service"
meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend +8 -2
index 0fa7f97..fb31f92 100644
@@ -7,6 +7,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://rpcbind.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "rpcbind.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+}
 
meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend +3 -2
index b813a50..85d99ed 100644
@@ -6,5 +6,6 @@ DEPENDS += "systemd"
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend +9 -2
index cc98fe1..34b82f7 100644
@@ -8,5 +8,12 @@ SRC_URI += " \
         file://zram.service \
 "
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "zram.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "zram.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend +3 -2
index 2828a70..6fe4b9f 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 inherit systemd
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "lxdm.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "lxdm.service"
meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend +9 -2
index 5bc5bc3..5f829ac 100644
@@ -6,5 +6,12 @@ inherit systemd
 
 SRC_URI += "file://xinput-calibrator.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend +7 -4
index b6b77c9..9310513 100644
@@ -10,12 +10,15 @@ SRC_URI += "file://xserver-nodm.service \
 
 do_install_append() {
         install -d ${D}${sysconfdir}/default
+	install -d ${D}${systemd_unitdir}/system
         install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
+	install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "xserver-nodm.service"
 
-FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm"
+FILES_${PN} += "${sysconfdir}/default/xserver-nodm"
 
-RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit"
+RDEPENDS_${PN} += "xserver-common (>= 1.30) xinit"
meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend +3 -2
index 9504761..23e0bc3 100644
@@ -6,8 +6,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://gpsd.service"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.socket"
 SYSTEMD_OESCONS = "true"
 
 do_install_append() {
meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend +3 -2
index 92c2e77..95e2f7a 100644
@@ -7,5 +7,6 @@ EXTRA_OECONF += " \
   --with-systemdsystemunitdir=${systemd_unitdir}/system \
 "
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend +3 -2
index b8150b7..74e5ae8 100644
@@ -2,5 +2,6 @@ inherit systemd
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "pcscd.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "pcscd.socket"
meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend +3 -2
index a60a109..5334fff 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend +3 -2
index 9d0f18c..87eb3bb 100644
@@ -9,6 +9,7 @@ DEPENDS += "systemd"
 
 SRC_URI += "file://add-systemd-support.patch"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "udisks-daemon.service"
 SYSTEMD_AUTO_ENABLE = "disable"
meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend +4 -3
index d41ca93..ec0f08d 100644
@@ -2,8 +2,9 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "avahi-daemon.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "avahi-daemon.service"
 SYSTEMD_AUTO_ENABLE = "enable"
 
-FILES_${PN}-systemd += "${systemd_unitdir}/system/"
+FILES_${PN} += "${systemd_unitdir}/system/"
meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend +3 -2
index 8945a6d..004c494 100644
@@ -4,6 +4,7 @@ inherit systemd
 
 EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "bluetooth.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "bluetooth.service"
 SYSTEMD_AUTO_ENABLE = "disable"
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.10.bbappend +3 -2
index a9d13e6..dd0469a 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "connman.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "connman.service"
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend +18 -4
index fde2426..aec1dfb 100644
@@ -5,12 +5,26 @@ inherit systemd
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd dhcp-client-systemd"
-SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service"
-SYSTEMD_SERVICE_dhcp-relay-systemd = "dhcrelay.service"
-SYSTEMD_SERVICE_dhcp-client-systemd = "dhclient.service"
+SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client"
+SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
+SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service"
+SYSTEMD_SERVICE_dhcp-client = "dhclient.service"
+
+FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service"
+FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service"
+FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service"
+RPROVIDES_dhcp-server += "dhcp-server-systemd"
+RPROVIDES_dhcp-relay += "dhcp-relay-systemd"
+RPROVIDES_dhcp-client += "dhcp-client-systemd"
 
 SRC_URI += "file://dhcpd.service \
             file://dhclient.service \
             file://dhcrelay.service \
            "
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend +3 -2
index a061b52..9923708 100644
@@ -2,6 +2,7 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "ofono.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "ofono.service"
 SYSTEMD_AUTO_ENABLE = "disable"
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend +0 -0
index a459065..fe5c919 100644

meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" · line 8

Quoted 9 lines
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend +4 -2
@@ -2,9 +2,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 PRINC := "${@int(PRINC) + 1}"
 
-SYSTEMD_PACKAGES = "openssh-sshd-systemd"
-SYSTEMD_SERVICE = "sshd.socket"
+SYSTEMD_PACKAGES = "openssh-sshd"
+SYSTEMD_SERVICE_openssh-sshd = "sshd.socket"
+FILES_openssh-sshd += "${systemd_unitdir}/system/sshd.socket"
+RPROVIDES_openssh-sshd += "openssh-sshd-systemd"

I'm still getting missing RPROVIDER for openssh-sshd-systemd and bitbake -e shows interesting behavior:

# $RPROVIDES_openssh-sshd [2 operations]
# append
# /OE/shr-core/meta-openembedded/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend:8
# "openssh-sshd-systemd"
# rename from RPROVIDES_${PN}-sshd data.py:161 [expandKeys]
# "sshd"
# computed:
# "sshd"
RPROVIDES_openssh-sshd="sshd"

Any idea why?

Quoted 82 lines
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend +7 -0
 inherit systemd
 
 SRC_URI += "file://sshd.socket file://[email protected] file://sshdgenkeys.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/[email protected] ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend +8 -2
index c0276a3..281c440 100644
@@ -4,8 +4,14 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "portmap.service"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "portmap.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
 SRC_URI_append = " file://portmap.service"
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend +3 -2
index 809a554..e0b1aba 100644
@@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "uuidd.socket"
+SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "uuidd.socket"
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend +7 -0
index 0e08358..89079dc 100644
@@ -7,4 +7,11 @@ inherit systemd
 SRC_URI += "file://lighttpd.service"
 
 SYSTEMD_PACKAGES = "${PN}"
+RPROVIDES_${PN} += "${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
+}
+
meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb +1 -1
index f33b2a9..3b3c1dc 100644
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 PR = "r1"
 
 inherit systemd
-SYSTEMD_SERVICE = ""
+SYSTEMD_SERVICE_${PN} = ""
 SYSTEMD_PACKAGES = "${PN}"
 NATIVE_SYSTEMD_SUPPORT = "1"
 ALLOW_EMPTY_${PN} = "1"
Signature · 7 lines
1.7.9.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#5 lore raw

Re: [meta-systemd][PATCH 2/2] meta-systemd: Append ${PN} to SYSTEMD_SERVICE

Quoted 13 lines · Martin Jansa

I'm still getting missing RPROVIDER for openssh-sshd-systemd and bitbake -e shows interesting behavior:

# $RPROVIDES_openssh-sshd [2 operations]
# append
# /OE/shr-core/meta-openembedded/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend:8
# "openssh-sshd-systemd"
# rename from RPROVIDES_${PN}-sshd data.py:161 [expandKeys]
# "sshd"
# computed:
# "sshd"
RPROVIDES_openssh-sshd="sshd"

Quoted 1 line

Any idea why?

hmmm I do not get it. Did you do a clean build or incremental ?

#6 lore raw

Re: [meta-systemd][PATCH 2/2] meta-systemd: Append ${PN} to SYSTEMD_SERVICE

Quoted 14 lines · Khem Raj
Quoted 13 lines · Martin Jansa

I'm still getting missing RPROVIDER for openssh-sshd-systemd and bitbake -e shows interesting behavior:

# $RPROVIDES_openssh-sshd [2 operations]
# append
# /OE/shr-core/meta-openembedded/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend:8
# "openssh-sshd-systemd"
# rename from RPROVIDES_${PN}-sshd data.py:161 [expandKeys]
# "sshd"
# computed:
# "sshd"
RPROVIDES_openssh-sshd="sshd"

Quoted 3 lines
Quoted 1 line

Any idea why?

hmmm I do not get it. Did you do a clean build or incremental ?

Just for reference it was caused by this:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2013-April/044941.html

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#7 lore raw
In reply to Khem Raj
Quoted 1 line · Khem Raj

good old meta-systemd should now parse again, I wont apply this 2 commits until systemd discussion in oe-core is finished and future of meta-systemd decided.

Quoted 244 lines
---
 meta-systemd/classes/systemd.bbclass |  225 ----------------------------------
 1 file changed, 225 deletions(-)
 delete mode 100644 meta-systemd/classes/systemd.bbclass
meta-systemd/classes/systemd.bbclass deleted +0 -225
deleted file mode 100644
index f2a0363..0000000
@@ -1,225 +0,0 @@
-DEPENDS_append = " systemd-systemctl-native"
-
-SYSTEMD_AUTO_ENABLE ??= "enable"
-
-SYSTEMD_AUTO_RRECOMMENDS ??= "enable"
-
-systemd_postinst() {
-OPTS=""
-
-if [ -n "$D" ]; then
-    OPTS="--root=$D"
-fi
-
-systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
-
-if [ -z "$D" -a ${SYSTEMD_AUTO_ENABLE} = "enable" ]; then
-    systemctl start ${SYSTEMD_SERVICE}
-fi
-}
-
-systemd_prerm() {
-if [ -z "$D" ]; then
-    systemctl stop ${SYSTEMD_SERVICE}
-fi
-
-systemctl disable ${SYSTEMD_SERVICE}
-}
-
-def get_package_var(d, var, pkg):
-    val = (d.getVar('%s_%s' % (var, pkg), 1) or "").strip()
-    if val == "":
-        val = (d.getVar(var, 1) or "").strip()
-    return val
-
-def systemd_after_parse(d):
-    def systemd_check_vars():
-        if d.getVar('BB_WORKERCONTEXT', True) is not None:
-            return
-
-        bb_filename = d.getVar('FILE')
-        packages = d.getVar('PACKAGES', 1)
-
-        # check SYSTEMD_PACKAGES
-        systemd_pkgs = d.getVar('SYSTEMD_PACKAGES', 1) or ""
-        if systemd_pkgs == "":
-            raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_PACKAGES" % bb_filename
-        for pkg_systemd in systemd_pkgs.split():
-            if pkg_systemd.find("-systemd") == -1:
-                if pkg_systemd != d.getVar('PN', 1):
-                    raise bb.build.FuncFailed, \
-                        "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
-                        (bb_filename, pkg_systemd)
-            else:
-                pkg_systemd_base = pkg_systemd
-                if pkg_systemd_base.endswith('-systemd'):
-                    pkg_systemd_base = pkg_systemd[:-8]
-                if pkg_systemd_base not in packages:
-                    raise bb.build.FuncFailed, \
-                        "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
-                        ( bb_filename, pkg_systemd)
-
-    # prepend systemd-packages not already included
-    def systemd_create_package(pkg_systemd):
-        packages = d.getVar('PACKAGES', 1)
-        if not pkg_systemd in packages:
-            packages = "%s %s" % (pkg_systemd, packages)
-            d.setVar('PACKAGES', packages)
-
-
-    bpn = d.getVar('BPN', 1)
-    ml = d.getVar('MLPREFIX', 1) or ""
-    if bpn + "-native" != d.getVar('PN', 1) and \
-            bpn + "-cross" != d.getVar('PN', 1) and \
-            ml + bpn == d.getVar('PN', 1) and \
-            "nativesdk-" + bpn != d.getVar('PN', 1):
-        systemd_check_vars()
-        for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
-            systemd_create_package(pkg_systemd)
-
-
-python __anonymous() {
-    systemd_after_parse(d)
-}
-
-# automatically install all *.service and *.socket supplied in recipe's SRC_URI
-do_install_append() {
-    for service in `find ${WORKDIR} -maxdepth 1 -name '*.service' -o -name '*.socket'` ; do
-    # ensure installing systemd-files only (e.g not avahi *.service)
-    if grep -q '\[Unit\]' $service ; then
-        install -d ${D}${systemd_unitdir}/system
-        install -m 644 $service ${D}${systemd_unitdir}/system
-    fi
-    done
-}
-
-python populate_packages_prepend () {
-    def systemd_generate_package_scripts(pkg):
-        bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % pkg)
-        localdata = d.createCopy()
-        overrides = localdata.getVar("OVERRIDES", 1)
-        localdata.setVar("OVERRIDES", "%s:%s" % (pkg, overrides))
-        bb.data.update_data(localdata)
-
-        """
-        systemd postinst is appended here because pkg_postinst may require to
-        execute on the target. Not doing so may cause systemd postinst invoked
-        twice to cause unwanted warnings.
-        """ 
-        postinst = localdata.getVar('pkg_postinst', 1)
-        if not postinst:
-            postinst = '#!/bin/sh\n'
-        postinst += localdata.getVar('systemd_postinst', 1)
-        d.setVar('pkg_postinst_%s' % pkg, postinst)
-
-        prerm = localdata.getVar('pkg_prerm', 1)
-        if not prerm:
-            prerm = '#!/bin/sh\n'
-        prerm += localdata.getVar('systemd_prerm', 1)
-        d.setVar('pkg_prerm_%s' % pkg, prerm)
-
-    # add files to FILES_*-systemd if existent and not already done
-    def systemd_append_file(pkg_systemd, file_append):
-        appended = False
-        if os.path.exists('${D}' + file_append):
-            var_name = "FILES_" + pkg_systemd
-            files = d.getVar(var_name, 0) or ""
-            if file_append not in files.split():
-                d.setVar(var_name, "%s %s" % (files, file_append))
-                appended = True
-        return appended
-
-    # add systemd files to FILES_*-systemd, parse for Also= and follow recursive
-    def systemd_add_files_and_parse(pkg_systemd, path, service, keys):
-        # avoid infinite recursion
-        if systemd_append_file(pkg_systemd, path + service):
-            fullpath = '${D}' + path + service
-            if service.find('.socket') != -1:
-                # for *.socket add *.service and *@.service
-                service_base = service.replace('.socket', '')
-                systemd_add_files_and_parse(pkg_systemd, path, service_base + '.service', keys)
-                systemd_add_files_and_parse(pkg_systemd, path, service_base + '@.service', keys)
-            for key in keys.split():
-                # recurse all dependencies found in keys ('Also';'Conflicts';..) and add to files
-                cmd = "grep %s %s | sed 's,%s=,,g' | tr ',' '\\n'" % (key, fullpath, key)
-                pipe = os.popen(cmd, 'r')
-                line = pipe.readline()
-                while line:
-                    line = line.replace('\n', '')
-                    systemd_add_files_and_parse(pkg_systemd, path, line, keys)
-                    line = pipe.readline()
-                pipe.close()
-
-    # check service-files and call systemd_add_files_and_parse for each entry
-    def systemd_check_services():
-        base_libdir = d.getVar('base_libdir', 1)
-        searchpaths = '/etc/systemd/system/' + ' '
-        searchpaths += '/lib/systemd/system/' + ' '
-        searchpaths += '/usr/lib/systemd/system/' + ' '
-        systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1)
-        has_exactly_one_service = len(systemd_packages.split()) == 1
-        if has_exactly_one_service:
-            has_exactly_one_service = len(get_package_var(d, 'SYSTEMD_SERVICE', systemd_packages).split()) == 1
-
-        keys = 'Also' # Conflicts??
-        if has_exactly_one_service:
-            # single service gets also the /dev/null dummies
-            keys = 'Also Conflicts'
-        # scan for all in SYSTEMD_SERVICE[]
-        for pkg_systemd in systemd_packages.split():
-            for service in get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd).split():
-                path_found = ''
-                for path in searchpaths.split():
-                    if os.path.exists('${D}' + path + service):
-                        path_found = path
-                if path_found != '':
-                    systemd_add_files_and_parse(pkg_systemd, path_found, service, keys)
-                else:
-                    raise bb.build.FuncFailed, "\n\nFor package %s SYSTEMD_SERVICE-entry %s does not exist" % \
-                        (pkg_systemd, service)
-
-    """     Setup rdepends / rrecommmends as:
-
-                -----------------------------
-                |  pkg_systemd_base: 'foo'  |
-                -----------------------------
-                           |    ^
-                           |    |                 --------------
-               rrecommends |    | rdepends        | 'systemd'  |
-                           |    |               ->--------------
-                           V    |              / rdepends
-                ------------------------------/
-                | pkg_systemd: 'foo-systemd' |
-                ------------------------------
-    """
-    def systemd_add_rdepends_rrecommends(pkg_systemd):
-        # RDEPENDS_${pkg_systemd} += pkg_systemd_base systemd
-        rdepends = d.getVar('RDEPENDS_' + pkg_systemd, 1) or ""
-        rdepends_arr = rdepends.split()
-        if not 'systemd' in rdepends_arr:
-            rdepends = '%s %s' % (rdepends, 'systemd')
-        pkg_systemd_base = pkg_systemd.replace('-systemd', '')
-        # no automatism for:
-        # recipes setting rdepends themselves AND
-        # not rdepending myself AND
-        # avoid double entries
-        if len(rdepends_arr) == 0 and pkg_systemd != '${PN}' and not pkg_systemd_base in rdepends:
-            rdepends = '%s %s' % (rdepends, pkg_systemd_base)
-        d.setVar('RDEPENDS_' + pkg_systemd, rdepends)
-        auto_rrecommends = d.getVar('SYSTEMD_AUTO_RRECOMMENDS', 1) or 'enable'
-        if auto_rrecommends == 'enable':
-            # RRECOMMENDS_${pkg_systemd_base} += pkg_systemd systemd
-            rrecommends = d.getVar('RRECOMMENDS_' + pkg_systemd_base, 1) or ""
-            # not rrecommending myself AND avoid double entries
-            if pkg_systemd != pkg_systemd_base and not pkg_systemd in rrecommends.split():
-                rrecommends = '%s %s' % (rrecommends, pkg_systemd)
-            d.setVar('RRECOMMENDS_' + pkg_systemd_base, rrecommends)
-
-    # run all modifications once when creating package
-    if os.path.exists('${D}'):
-        for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
-            if get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd) != "":
-                systemd_generate_package_scripts(pkg_systemd)
-                systemd_add_rdepends_rrecommends(pkg_systemd)
-        systemd_check_services()
-}
Signature · 7 lines
1.7.9.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#8 lore raw
Quoted 4 lines · Martin Jansa
Quoted 1 line · Khem Raj

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

Andreas

#9 lore raw
Quoted 6 lines · Andreas Müller
Quoted 4 lines · Martin Jansa
Quoted 1 line · Khem Raj

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

But be aware that I've fixed only parsing of avahi and wpa-supplicant.

I haven't tested it properly in runtime because my upgrade path is a bit broken (because I was building images with khem's patches for a while to test other stuff) and even clean build with failed to boot with qemux86-64 and I don't have time to debug it now.

Quoted 6 lines
Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

yes :/

If we need to maintain meta-systemd bbappends for upgrade path we can also maintain them with PN-systemd packages and good old systemd bbclass.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#10 lore raw

meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

Quoted 19 lines · Martin Jansa
Quoted 6 lines · Andreas Müller
Quoted 4 lines · Martin Jansa
Quoted 1 line · Khem Raj

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

But be aware that I've fixed only parsing of avahi and wpa-supplicant.

I haven't tested it properly in runtime because my upgrade path is a bit broken (because I was building images with khem's patches for a while to test other stuff) and even clean build with failed to boot with qemux86-64 and I don't have time to debug it now.

Quoted 4 lines
Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

Quoted 7 lines
Quoted 2 lines

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

yes :/

If we need to maintain meta-systemd bbappends for upgrade path we can also maintain them with PN-systemd packages and good old systemd bbclass.

Khem pinged me about this patch, so here are my thoughts:

PN-systemd discussion in oe-core haven't moved a bit since this patch was proposed, I think we have 2-3 options, lets vote about meta-systemd future.

1) keep PN-systemd separation in meta-systemd and fixup .bbappends to resolve issues created by oe-core (I've fixed some issues, but still a lot of issues in postinst/postrm/prerm scripts when both inits are sharing the same PN)

2) give up on clean separation of PN-<init> and provide upgrade path from PN-systemd to PN (mostly done by these 2 commits from khem).

3) give up on clean separation of PN-<init> and upgrade path (there are many issues in other parts of oe-core, so upgrade path from danny to dylan doesn't look usable.

A) migrate existing .bbappends to their recipes to .bb files and remove this layer. Any volunteer for that?

My vote: 3) + A) later in 1.5
I guess we're all too busy to implement 1), upgrade path would be nice, but is all-or-nothing, doesn't make much sense to spend a lot of time fixing every issue from PN-systemd when there are issues from other recipes we're not going to fix by .bbappends in meta-oe.

Vote required from Khem, Koen, Andreas, Enrico, Otavio Vote welcome from other meta-systemd contributors

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#11 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

Quoted 6 lines · Martin Jansa

On Tue, Mar 05, 2013 at 11:59:07PM +0100, Martin Jansa wrote:
My vote: 3) + A) later in 1.5
I guess we're all too busy to implement 1), upgrade path would be nice, but is all-or-nothing, doesn't make much sense to spend a lot of time fixing every issue from PN-systemd when there are issues from other recipes we're not going to fix by .bbappends in meta-oe.

+1

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

#12 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

In reply to Martin Jansa

Op 9 apr. 2013, om 22:01 heeft Martin Jansa <[email protected]> het volgende geschreven:

Quoted 45 lines · Martin Jansa
Quoted 19 lines · Andreas Müller
Quoted 6 lines · Martin Jansa
Quoted 4 lines · Khem Raj
Quoted 1 line

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

But be aware that I've fixed only parsing of avahi and wpa-supplicant.

I haven't tested it properly in runtime because my upgrade path is a bit broken (because I was building images with khem's patches for a while to test other stuff) and even clean build with failed to boot with qemux86-64 and I don't have time to debug it now.

Quoted 4 lines
Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

Quoted 7 lines
Quoted 2 lines

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

yes :/

If we need to maintain meta-systemd bbappends for upgrade path we can also maintain them with PN-systemd packages and good old systemd bbclass.

Khem pinged me about this patch, so here are my thoughts:

PN-systemd discussion in oe-core haven't moved a bit since this patch was proposed, I think we have 2-3 options, lets vote about meta-systemd future.

1) keep PN-systemd separation in meta-systemd and fixup .bbappends to resolve issues created by oe-core (I've fixed some issues, but still a lot of issues in postinst/postrm/prerm scripts when both inits are sharing the same PN)

2) give up on clean separation of PN-<init> and provide upgrade path from PN-systemd to PN (mostly done by these 2 commits from khem).

3) give up on clean separation of PN-<init> and upgrade path (there are many issues in other parts of oe-core, so upgrade path from danny to dylan doesn't look usable.

Quoted 8 lines

A) migrate existing .bbappends to their recipes to .bb files and remove this layer. Any volunteer for that?

My vote: 3) + A) later in 1.5
I guess we're all too busy to implement 1), upgrade path would be nice, but is all-or-nothing, doesn't make much sense to spend a lot of time fixing every issue from PN-systemd when there are issues from other recipes we're not going to fix by .bbappends in meta-oe.

Upgrade paths are totally broken anyway, so let's go for 3 + A

#13 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

Quoted 1 line · Koen Kooi

Upgrade paths are totally broken anyway, so let's go for 3 + A

As you keep saying this, it would be great if someone would do an upgrade from danny to dylan and actually report the breakages. Thanks mainly to Martin the bulk of the package transitions that I'm aware of have replaces/conflicts/provides in place.

Ross

#14 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

Quoted 7 lines · Ross
Quoted 1 line · Koen Kooi

Upgrade paths are totally broken anyway, so let's go for 3 + A

As you keep saying this, it would be great if someone would do an upgrade from danny to dylan and actually report the breakages. Thanks mainly to Martin the bulk of the package transitions that I'm aware of have replaces/conflicts/provides in place.

I should have asked which Monday he meant.. it's still not fixed connman:
http://lists.linuxtogo.org/pipermail/openembedded-core/2013-March/037355.html

util-linux:
http://permalink.gmane.org/gmane.comp.handhelds.openembedded.core/34410

and I can find a lot more in my sent folder if I really care :/.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#15 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

Quoted 8 lines · Martin Jansa

I should have asked which Monday he meant.. it's still not fixed connman:
http://lists.linuxtogo.org/pipermail/openembedded-core/2013-March/037355.html

util-linux:
http://permalink.gmane.org/gmane.comp.handhelds.openembedded.core/34410

and I can find a lot more in my sent folder if I really care :/.

Thanks Martin, I'll chase those. Probably too late for 1.4.0 but obviously we can fix in master and add to 1.4.1.

Ross

#16 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

In reply to Martin Jansa
Quoted 48 lines · Martin Jansa
Quoted 19 lines · Martin Jansa
Quoted 6 lines · Andreas Müller
Quoted 4 lines · Martin Jansa
Quoted 1 line · Khem Raj

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

But be aware that I've fixed only parsing of avahi and wpa-supplicant.

I haven't tested it properly in runtime because my upgrade path is a bit broken (because I was building images with khem's patches for a while to test other stuff) and even clean build with failed to boot with qemux86-64 and I don't have time to debug it now.

Quoted 4 lines
Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

Quoted 7 lines
Quoted 2 lines

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

yes :/

If we need to maintain meta-systemd bbappends for upgrade path we can also maintain them with PN-systemd packages and good old systemd bbclass.

Khem pinged me about this patch, so here are my thoughts:

PN-systemd discussion in oe-core haven't moved a bit since this patch was proposed, I think we have 2-3 options, lets vote about meta-systemd future.

1) keep PN-systemd separation in meta-systemd and fixup .bbappends to resolve issues created by oe-core (I've fixed some issues, but still a lot of issues in postinst/postrm/prerm scripts when both inits are sharing the same PN)

2) give up on clean separation of PN-<init> and provide upgrade path from PN-systemd to PN (mostly done by these 2 commits from khem).

3) give up on clean separation of PN-<init> and upgrade path (there are many issues in other parts of oe-core, so upgrade path from danny to dylan doesn't look usable.

A) migrate existing .bbappends to their recipes to .bb files and remove this layer. Any volunteer for that?

Quoted 9 lines

My vote: 3) + A) later in 1.5
I guess we're all too busy to implement 1), upgrade path would be nice, but is all-or-nothing, doesn't make much sense to spend a lot of time fixing every issue from PN-systemd when there are issues from other recipes we're not going to fix by .bbappends in meta-oe.

Vote required from Khem, Koen, Andreas, Enrico, Otavio Vote welcome from other meta-systemd contributors

tend also to 3) + A) but I would prefer to have it as one transaction. Otherwise we might face another upgrade path breakage. I know this will cause questions as who and when...

Andreas

author
#17 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

Quoted 55 lines · Andreas Müller
Quoted 54 lines · Martin Jansa
Quoted 19 lines · Martin Jansa
Quoted 6 lines · Andreas Müller
Quoted 4 lines · Martin Jansa
Quoted 1 line · Khem Raj

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

But be aware that I've fixed only parsing of avahi and wpa-supplicant.

I haven't tested it properly in runtime because my upgrade path is a bit broken (because I was building images with khem's patches for a while to test other stuff) and even clean build with failed to boot with qemux86-64 and I don't have time to debug it now.

Quoted 4 lines
Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

Quoted 7 lines
Quoted 2 lines

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

yes :/

If we need to maintain meta-systemd bbappends for upgrade path we can also maintain them with PN-systemd packages and good old systemd bbclass.

Khem pinged me about this patch, so here are my thoughts:

PN-systemd discussion in oe-core haven't moved a bit since this patch was proposed, I think we have 2-3 options, lets vote about meta-systemd future.

1) keep PN-systemd separation in meta-systemd and fixup .bbappends to resolve issues created by oe-core (I've fixed some issues, but still a lot of issues in postinst/postrm/prerm scripts when both inits are sharing the same PN)

2) give up on clean separation of PN-<init> and provide upgrade path from PN-systemd to PN (mostly done by these 2 commits from khem).

3) give up on clean separation of PN-<init> and upgrade path (there are many issues in other parts of oe-core, so upgrade path from danny to dylan doesn't look usable.

A) migrate existing .bbappends to their recipes to .bb files and remove this layer. Any volunteer for that?

My vote: 3) + A) later in 1.5
I guess we're all too busy to implement 1), upgrade path would be nice, but is all-or-nothing, doesn't make much sense to spend a lot of time fixing every issue from PN-systemd when there are issues from other recipes we're not going to fix by .bbappends in meta-oe.

Quoted 6 lines
Quoted 3 lines

Vote required from Khem, Koen, Andreas, Enrico, Otavio Vote welcome from other meta-systemd contributors

tend also to 3) + A) but I would prefer to have it as one transaction. Otherwise we might face another upgrade path breakage. I know this will cause questions as who and when…

actually, 3+A is going to take some time I feel first 2 (without upgrade path) and then eventually 3+A would get us there

Quoted 2 lines

Andreas

#18 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

In reply to Martin Jansa
Quoted 41 lines · Martin Jansa
Quoted 19 lines · Martin Jansa
Quoted 6 lines · Andreas Müller
Quoted 4 lines · Martin Jansa
Quoted 1 line · Khem Raj

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

But be aware that I've fixed only parsing of avahi and wpa-supplicant.

I haven't tested it properly in runtime because my upgrade path is a bit broken (because I was building images with khem's patches for a while to test other stuff) and even clean build with failed to boot with qemux86-64 and I don't have time to debug it now.

Quoted 4 lines
Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

Quoted 7 lines
Quoted 2 lines

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

yes :/

If we need to maintain meta-systemd bbappends for upgrade path we can also maintain them with PN-systemd packages and good old systemd bbclass.

Khem pinged me about this patch, so here are my thoughts:

PN-systemd discussion in oe-core haven't moved a bit since this patch was proposed, I think we have 2-3 options, lets vote about meta-systemd future.

1) keep PN-systemd separation in meta-systemd and fixup .bbappends to resolve issues created by oe-core (I've fixed some issues, but still a lot of issues in postinst/postrm/prerm scripts when both inits are sharing the same PN)

2) give up on clean separation of PN-<init> and provide upgrade path from PN-systemd to PN (mostly done by these 2 commits from khem).

Quoted 8 lines

3) give up on clean separation of PN-<init> and upgrade path (there are many issues in other parts of oe-core, so upgrade path from danny to dylan doesn't look usable.

A) migrate existing .bbappends to their recipes to .bb files and remove this layer. Any volunteer for that?

My vote: 3) + A) later in 1.5

A bit off-topic and mentioned here & there: I am working on network-manager(-applet) 0.9.8.0 update and xinput-calibrator. I could add 3) + A) for them if agreed. Hope to send them beginning of next week.

Anderas

author
#19 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

Quoted 1 line · Andreas Müller

On Tue, Apr 9, 2013 at 10:01 PM, Martin Jansa <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines · Martin Jansa
Quoted 2 lines · Andreas Müller
Quoted 1 line

On Tue, Mar 5, 2013 at 11:18 PM, Martin Jansa <[email protected]>

Quoted 17 lines · wrote:
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
Quoted 4 lines · Khem Raj
Quoted 1 line

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

But be aware that I've fixed only parsing of avahi and wpa-supplicant.

I haven't tested it properly in runtime because my upgrade path is a bit broken (because I was building images with khem's patches for a while to test other stuff) and even clean build with failed to boot with qemux86-64 and I don't have time to debug it now.

Quoted 4 lines
Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

yes :/

If we need to maintain meta-systemd bbappends for upgrade path we can also maintain them with PN-systemd packages and good old systemd

bbclass.

Quoted 5 lines
Quoted 5 lines

Khem pinged me about this patch, so here are my thoughts:

PN-systemd discussion in oe-core haven't moved a bit since this patch was proposed, I think we have 2-3 options, lets vote about meta-systemd

future.

Quoted 13 lines
Quoted 13 lines

1) keep PN-systemd separation in meta-systemd and fixup .bbappends to resolve issues created by oe-core (I've fixed some issues, but still a lot of issues in postinst/postrm/prerm scripts when both inits are sharing the same PN)

2) give up on clean separation of PN-<init> and provide upgrade path from PN-systemd to PN (mostly done by these 2 commits from khem).

3) give up on clean separation of PN-<init> and upgrade path (there are many issues in other parts of oe-core, so upgrade path from danny to dylan doesn't look usable.

Quoted 9 lines
Quoted 4 lines

A) migrate existing .bbappends to their recipes to .bb files and remove this layer. Any volunteer for that?

My vote: 3) + A) later in 1.5

A bit off-topic and mentioned here & there: I am working on network-manager(-applet) 0.9.8.0 update and xinput-calibrator. I could add 3) + A) for them if agreed. Hope to send them beginning of next week.

Sure I see no problem

Quoted 2 lines

Anderas

#20 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

Quoted 55 lines · Khem Raj
Quoted 1 line · Andreas Müller

On Tue, Apr 9, 2013 at 10:01 PM, Martin Jansa <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines · Martin Jansa
Quoted 2 lines · Andreas Müller
Quoted 1 line

On Tue, Mar 5, 2013 at 11:18 PM, Martin Jansa <[email protected]>

Quoted 17 lines · wrote:
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
Quoted 4 lines · Khem Raj
Quoted 1 line

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

But be aware that I've fixed only parsing of avahi and wpa-supplicant.

I haven't tested it properly in runtime because my upgrade path is a bit broken (because I was building images with khem's patches for a while to test other stuff) and even clean build with failed to boot with qemux86-64 and I don't have time to debug it now.

Quoted 4 lines
Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

yes :/

If we need to maintain meta-systemd bbappends for upgrade path we can also maintain them with PN-systemd packages and good old systemd

bbclass.

Quoted 5 lines
Quoted 5 lines

Khem pinged me about this patch, so here are my thoughts:

PN-systemd discussion in oe-core haven't moved a bit since this patch was proposed, I think we have 2-3 options, lets vote about meta-systemd

future.

Quoted 16 lines
Quoted 16 lines

1) keep PN-systemd separation in meta-systemd and fixup .bbappends to resolve issues created by oe-core (I've fixed some issues, but still a lot of issues in postinst/postrm/prerm scripts when both inits are sharing the same PN)

2) give up on clean separation of PN-<init> and provide upgrade path from PN-systemd to PN (mostly done by these 2 commits from khem).

3) give up on clean separation of PN-<init> and upgrade path (there are many issues in other parts of oe-core, so upgrade path from danny to dylan doesn't look usable.

A) migrate existing .bbappends to their recipes to .bb files and remove this layer. Any volunteer for that?

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

My vote: 3) + A) later in 1.5

A bit off-topic and mentioned here & there: I am working on network-manager(-applet) 0.9.8.0 update and xinput-calibrator. I could add 3) + A) for them if agreed. Hope to send them beginning of next week.

Sure I see no problem

OK, all systemd related changes should be now in master.

I'll do A) for meta-efl.

If someone starts working on A) for some other recipes, please write reply here so that we don't duplicate work.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#21 lore raw

Re: meta-systemd future vote Was: [meta-systemd][PATCH 1/2] Delete systemd class.

Quoted 63 lines · Martin Jansa
Quoted 62 lines · Khem Raj
Quoted 1 line · Andreas Müller

On Tue, Apr 9, 2013 at 10:01 PM, Martin Jansa <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines · Martin Jansa
Quoted 2 lines · Andreas Müller
Quoted 1 line

On Tue, Mar 5, 2013 at 11:18 PM, Martin Jansa <[email protected]>

Quoted 17 lines · wrote:
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
Quoted 4 lines · Khem Raj
Quoted 1 line

good old meta-systemd should now parse again,

Thanks - will come back to test HEADs soon.

But be aware that I've fixed only parsing of avahi and wpa-supplicant.

I haven't tested it properly in runtime because my upgrade path is a bit broken (because I was building images with khem's patches for a while to test other stuff) and even clean build with failed to boot with qemux86-64 and I don't have time to debug it now.

Quoted 4 lines
Quoted 4 lines

I wont apply this 2 commits
until systemd discussion in oe-core is finished and future of meta-systemd decided.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines

After systemd regression is worked around yocto 1.4 release regression is knocking at the door...

yes :/

If we need to maintain meta-systemd bbappends for upgrade path we can also maintain them with PN-systemd packages and good old systemd

bbclass.

Quoted 5 lines
Quoted 5 lines

Khem pinged me about this patch, so here are my thoughts:

PN-systemd discussion in oe-core haven't moved a bit since this patch was proposed, I think we have 2-3 options, lets vote about meta-systemd

future.

Quoted 22 lines
Quoted 9 lines

1) keep PN-systemd separation in meta-systemd and fixup .bbappends to resolve issues created by oe-core (I've fixed some issues, but still a lot of issues in postinst/postrm/prerm scripts when both inits are sharing the same PN)

2) give up on clean separation of PN-<init> and provide upgrade path from PN-systemd to PN (mostly done by these 2 commits from khem).

Quoted 8 lines

3) give up on clean separation of PN-<init> and upgrade path (there are many issues in other parts of oe-core, so upgrade path from danny to dylan doesn't look usable.

A) migrate existing .bbappends to their recipes to .bb files and remove this layer. Any volunteer for that?

My vote: 3) + A) later in 1.5

A bit off-topic and mentioned here & there: I am working on network-manager(-applet) 0.9.8.0 update and xinput-calibrator. I could add 3) + A) for them if agreed. Hope to send them beginning of next week.

Quoted 8 lines
Quoted 1 line

Sure I see no problem

OK, all systemd related changes should be now in master.

I'll do A) for meta-efl.

If someone starts working on A) for some other recipes, please write reply here so that we don't duplicate work.

OK, I'll take care of A) for other layers too, just please review them.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]