1 files changed, 15 insertions, 19 deletions

diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index db35717f6..a2c8ddf0e 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -1,5 +1,7 @@
 DEPENDS_append = " systemd-systemctl-native"
 
+SYSTEMD_AUTO_ENABLE ??= "enable"
+
 systemd_postinst() {
 OPTS=""
 
@@ -7,9 +9,9 @@ if [ -n "$D" ]; then
     OPTS="--root=$D"
 fi
 
-systemctl $OPTS enable ${SYSTEMD_SERVICE}
+systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
 
-if [ -z "$D" ]; then
+if [ -z "$D" -a ${SYSTEMD_AUTO_ENABLE} = "enable" ]; then
     systemctl start ${SYSTEMD_SERVICE}
 fi
 }
@@ -24,6 +26,12 @@ systemd_postrm() {
 systemctl disable ${SYSTEMD_SERVICE}
 }
 
+def get_package_var(d, var, pkg):
+        val = (d.getVar('%s_%s' % (var, pkg), d, 1) or "").strip()
+        if val == "":
+                val = (d.getVar(var, d, 1) or "").strip()
+        return val
+
 def systemd_after_parse(d):
         def systemd_check_vars():
                 if d.getVar('BB_WORKERCONTEXT', True) is not None:
@@ -40,25 +48,15 @@ def systemd_after_parse(d):
                         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} (deprecated)" % \
+                                                "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
                                                 (bb_filename, pkg_systemd)
-                                else:
-                                        # Only complain if recipe lacks native systemd support
-                                        native_systemd_support = d.getVar('NATIVE_SYSTEMD_SUPPORT', 1) or ""
-                                        if native_systemd_support == "":
-                                                bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename)
                         else:
                                 pkg_systemd_base = pkg_systemd.replace('-systemd', '')
                                 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} (deprecated)" % \
+                                                "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
                                                 ( bb_filename, pkg_systemd)
 
-                # check SYSTEMD_SERVICE
-                for pkg_systemd in systemd_pkgs.split():
-                        service_pkg = 'SYSTEMD_SERVICE' + "_" + pkg_systemd
-                        systemd_services = d.getVar(service_pkg, 1) or d.getVar('SYSTEMD_SERVICE', 1) or ""
-
         # prepend systemd-packages not already included
         def systemd_create_package(pkg_systemd):
                 packages = d.getVar('PACKAGES', 1)
@@ -160,8 +158,7 @@ python populate_packages_prepend () {
                 systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1)
                 has_exactly_one_service = len(systemd_packages.split()) == 1
                 if has_exactly_one_service:
-                        systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + systemd_packages, 1) or d.getVar('SYSTEMD_SERVICE', 1)
-                        has_exactly_one_service = len(systemd_services.split()) == 1
+                        has_exactly_one_service = len(get_package_var(d, 'SYSTEMD_SERVICE', systemd_packages).split()) == 1
 
                 keys = 'Also' # Conflicts??
                 if has_exactly_one_service:
@@ -169,8 +166,7 @@ python populate_packages_prepend () {
                         keys = 'Also Conflicts'
                 # scan for all in SYSTEMD_SERVICE[]
                 for pkg_systemd in systemd_packages.split():
-                        systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
-                        for service in systemd_services.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):
@@ -201,7 +197,7 @@ python populate_packages_prepend () {
         # run all modifications once when creating package
         if os.path.exists('${D}'):
                 for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
-                        if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip():
+                        if get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd) != "":
                                 systemd_generate_package_scripts(pkg_systemd)
                                 systemd_add_rdepends(pkg_systemd)
                 systemd_check_services()