diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-02-16 02:02:57 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-02-23 16:46:31 +0100 |
| commit | eb6c7f77b7c1e9b1ba377bfb4fb2f0c6735c604f (patch) | |
| tree | 964a5483e00989f1be0f11779fb7ffbe6197d3ad /meta-oe | |
| parent | 3502ef4afd1086fde15035a4a6ed0aab01d4a92c (diff) | |
| download | meta-openembedded-eb6c7f77b7c1e9b1ba377bfb4fb2f0c6735c604f.tar.gz | |
systemd.bbclass: cosmetics
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/classes/systemd.bbclass | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index a99036c01c..651735755a 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -72,7 +72,7 @@ python __anonymous() { } python populate_packages_prepend () { - def systemd_package(pkg): + def systemd_generate_package_scripts(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) @@ -96,10 +96,10 @@ 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) + 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) rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") @@ -107,7 +107,6 @@ python populate_packages_prepend () { bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d) - pkgs = bb.data.getVar('SYSTEMD_PACKAGES', d, 1) - for pkg in pkgs.split(): - systemd_package(pkg) + for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): + systemd_generate_package_scripts(pkg_systemd) } |