mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This removed the $D check, which should stay

This reverts commit 637cb7e3d2.
This commit is contained in:
Koen Kooi
2012-05-21 14:07:25 +02:00
parent 72ab8b0041
commit f6330ed09c
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/classes/systemd.bbclass
+13 -2
View File
@@ -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