* Calling "systemctl disable" from postrm is too late and
  causes the following error:

| Failed to issue method call: No such file or directory

* Messing with $D is not needed in *rm scripts.

Signed-off-by: Andreas Oberritter <[email protected]>
---
 meta-oe/classes/systemd.bbclass |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index db35717..1edd1e4 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -15,12 +15,7 @@ fi
 }
 
 systemd_prerm() {
-if [ -z "$D" ]; then
-    systemctl stop ${SYSTEMD_SERVICE}
-fi
-}
-
-systemd_postrm() {
+systemctl stop ${SYSTEMD_SERVICE}
 systemctl disable ${SYSTEMD_SERVICE}
 }
 
@@ -93,7 +88,7 @@ do_install_append() {
 
 python populate_packages_prepend () {
        def systemd_generate_package_scripts(pkg):
-               bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % 
pkg)
+               bb.debug(1, 'adding systemd calls to postinst/prerm for %s' % 
pkg)
                localdata = bb.data.createCopy(d)
                overrides = bb.data.getVar("OVERRIDES", localdata, 1)
                bb.data.setVar("OVERRIDES", "%s:%s" % (pkg, overrides), 
localdata)
@@ -116,12 +111,6 @@ 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
-- 
1.7.9.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Reply via email to