diff options
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 83833db6c..2ca7bfca5 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass | |||
@@ -1,7 +1,4 @@ | |||
1 | SYSTEMDPN ?= "${PN}" | ||
2 | |||
3 | DEPENDS_append = " systemd-systemctl-native" | 1 | DEPENDS_append = " systemd-systemctl-native" |
4 | RDEPENDS_${SYSTEMDPN}_append = " systemd" | ||
5 | 2 | ||
6 | systemd_postinst() { | 3 | systemd_postinst() { |
7 | OPTS="" | 4 | OPTS="" |
@@ -67,9 +64,14 @@ python populate_packages_prepend () { | |||
67 | postrm += bb.data.getVar('systemd_postrm', localdata, 1) | 64 | postrm += bb.data.getVar('systemd_postrm', localdata, 1) |
68 | bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) | 65 | bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) |
69 | 66 | ||
67 | rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") | ||
68 | rdepends.append("systemd") | ||
69 | bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d) | ||
70 | |||
71 | |||
70 | pkgs = bb.data.getVar('SYSTEMD_PACKAGES', d, 1) | 72 | pkgs = bb.data.getVar('SYSTEMD_PACKAGES', d, 1) |
71 | if pkgs == None: | 73 | if pkgs == None: |
72 | pkgs = bb.data.getVar('SYSTEMDPN', d, 1) | 74 | pkgs = bb.data.getVar('PN', d, 1) |
73 | packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() | 75 | packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() |
74 | if not pkgs in packages and packages != []: | 76 | if not pkgs in packages and packages != []: |
75 | pkgs = packages[0] | 77 | pkgs = packages[0] |