Revert "systemd.bbclass: drop postrm, use prerm instead"

This removed the $D check, which should stay

This reverts commit 637cb7e3d2cfdc74d239a4257e6f3477aa17da4e.

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/classes/systemd.bbclass b/meta-openembedded/meta-oe/classes/systemd.bbclass
index 1edd1e4..db35717 100644 (file)
--- a/meta-openembedded/meta-oe/classes/systemd.bbclass
+++ b/meta-openembedded/meta-oe/classes/systemd.bbclass
@@ -15,7 +15,12 @@ fi
 }
 
 systemd_prerm() {
-systemctl stop ${SYSTEMD_SERVICE}
+if [ -z "$D" ]; then
+    systemctl stop ${SYSTEMD_SERVICE}
+fi
+}
+
+systemd_postrm() {
 systemctl disable ${SYSTEMD_SERVICE}
 }
 
@@ -88,7 +93,7 @@ do_install_append() {
 
 python populate_packages_prepend () {
        def systemd_generate_package_scripts(pkg):
-               bb.debug(1, 'adding systemd calls to postinst/prerm for %s' % pkg)
+               bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % pkg)
                localdata = bb.data.createCopy(d)
                overrides = bb.data.getVar("OVERRIDES", localdata, 1)
                bb.data.setVar("OVERRIDES", "%s:%s" % (pkg, overrides), localdata)
@@ -111,6 +116,12 @@ python populate_packages_prepend () {
                prerm += bb.data.getVar('systemd_prerm', localdata, 1)
                bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d)
 
+               postrm = bb.data.getVar('pkg_postrm', localdata, 1)
+               if not postrm:
+                       postrm = '#!/bin/sh\n'
+               postrm += bb.data.getVar('systemd_postrm', localdata, 1)
+               bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
+
        # add files to FILES_*-systemd if existent and not already done
        def systemd_append_file(pkg_systemd, file_append):
                appended = False