From 051102329c49b50d336f304ac04a1f3ff6e8ec99 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 8 Nov 2011 12:58:00 +0000 Subject: 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 Signed-off-by: Koen Kooi --- meta-oe/classes/systemd.bbclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta-oe/classes') 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] -- cgit v1.2.3-54-g00ecf