diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2011-11-08 12:58:00 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2011-11-08 14:07:51 +0100 |
| commit | 051102329c49b50d336f304ac04a1f3ff6e8ec99 (patch) | |
| tree | e283f9b9b959e0ca41d592f0ccd8cd408de0afa2 /meta-oe/classes | |
| parent | 80689864f3cd535727db6bae3a7bbb50d768429e (diff) | |
| download | meta-openembedded-051102329c49b50d336f304ac04a1f3ff6e8ec99.tar.gz | |
systemd.bbclass: stop using SYSTEMDPN to rdepends addition
The systemd runtime dependency needs to be add dynamically onto each
package that has the postinst generate thus removing the SYSTEMDPN use
et all.
Signed-off-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.bbclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index 83833db6c7..2ca7bfca5b 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -1,7 +1,4 @@ -SYSTEMDPN ?= "${PN}" - DEPENDS_append = " systemd-systemctl-native" -RDEPENDS_${SYSTEMDPN}_append = " systemd" systemd_postinst() { OPTS="" @@ -67,9 +64,14 @@ python populate_packages_prepend () { 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 "") + rdepends.append("systemd") + bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d) + + pkgs = bb.data.getVar('SYSTEMD_PACKAGES', d, 1) if pkgs == None: - pkgs = bb.data.getVar('SYSTEMDPN', d, 1) + pkgs = bb.data.getVar('PN', d, 1) packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() if not pkgs in packages and packages != []: pkgs = packages[0] |