aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/classes
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-05-16 16:56:01 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-05-17 09:37:57 +0200
commit637cb7e3d2cfdc74d239a4257e6f3477aa17da4e (patch)
tree0b4ee59e6920fccf2ecec9bc068f44131e1abf81 /meta-oe/classes
parent08dbadf9541f0e2e4ca5c8def8b9dfc9dacb5960 (diff)
downloadmeta-openembedded-637cb7e3d2cfdc74d239a4257e6f3477aa17da4e.tar.gz
meta-openembedded-637cb7e3d2cfdc74d239a4257e6f3477aa17da4e.tar.bz2
meta-openembedded-637cb7e3d2cfdc74d239a4257e6f3477aa17da4e.zip
systemd.bbclass: drop postrm, use prerm instead
* 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 <obi@opendreambox.org> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/classes')
-rw-r--r--meta-oe/classes/systemd.bbclass15
1 files changed, 2 insertions, 13 deletions
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index db35717f6..1edd1e407 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