From patchwork Thu Aug 16 14:07:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [meta-oe, meta-systemd] systemd.bbclass: add option to disable automatic RRECOMMENDS pkg-systemd_base -> pkg-systemd Date: Thu, 16 Aug 2012 14:07:46 -0000 From: Martin Jansa X-Patchwork-Id: 34715 Message-Id: <1345126066-1406-1-git-send-email-Martin.Jansa@gmail.com> To: openembedded-devel@lists.openembedded.org Signed-off-by: Martin Jansa Acked-by: Andreas Müller --- meta-systemd/classes/systemd.bbclass | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass index 4036f91..96d7f8f 100644 --- a/meta-systemd/classes/systemd.bbclass +++ b/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}'):