From 352226fd97520bd494d3f2003ee7b37fe78284c4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 16 Aug 2012 13:51:35 +0200 Subject: [PATCH] systemd.bbclass: add option to disable automatic RRECOMMENDS pkg-systemd_base -> pkg-systemd (From meta-openembedded rev: e008cc8688504687b1e3a62a149a78d3da1375e7) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-openembedded/meta-systemd/classes/systemd.bbclass | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/meta-openembedded/meta-systemd/classes/systemd.bbclass b/meta-openembedded/meta-systemd/classes/systemd.bbclass index 4036f91..96d7f8f 100644 --- a/meta-openembedded/meta-systemd/classes/systemd.bbclass +++ b/meta-openembedded/meta-systemd/classes/systemd.bbclass @@ -2,6 +2,8 @@ DEPENDS_append = " systemd-systemctl-native" SYSTEMD_AUTO_ENABLE ??= "enable" +SYSTEMD_AUTO_RRECOMMENDS ??= "enable" + systemd_postinst() { OPTS="" @@ -208,12 +210,14 @@ python populate_packages_prepend () { if len(rdepends_arr) == 0 and pkg_systemd != '${PN}' and not pkg_systemd_base in rdepends: rdepends = '%s %s' % (rdepends, pkg_systemd_base) d.setVar('RDEPENDS_' + pkg_systemd, rdepends) - # RRECOMMENDS_${pkg_systemd_base} += pkg_systemd systemd - rrecommends = d.getVar('RRECOMMENDS_' + pkg_systemd_base, 1) or "" - # not rrecommending myself AND avoid double entries - if pkg_systemd != pkg_systemd_base and not pkg_systemd in rrecommends.split(): - rrecommends = '%s %s' % (rrecommends, pkg_systemd) - d.setVar('RRECOMMENDS_' + pkg_systemd_base, rrecommends) + auto_rrecommends = d.getVar('SYSTEMD_AUTO_RRECOMMENDS', 1) or 'enable' + if auto_rrecommends == 'enable': + # RRECOMMENDS_${pkg_systemd_base} += pkg_systemd systemd + rrecommends = d.getVar('RRECOMMENDS_' + pkg_systemd_base, 1) or "" + # not rrecommending myself AND avoid double entries + if pkg_systemd != pkg_systemd_base and not pkg_systemd in rrecommends.split(): + rrecommends = '%s %s' % (rrecommends, pkg_systemd) + d.setVar('RRECOMMENDS_' + pkg_systemd_base, rrecommends) # run all modifications once when creating package if os.path.exists('${D}'): -- 2.7.4