diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-08-16 13:51:35 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-08-20 10:02:09 +0200 |
| commit | e008cc8688504687b1e3a62a149a78d3da1375e7 (patch) | |
| tree | dd1828bdaa62149d82a730a0b3d77d6c5d1d3416 /meta-systemd | |
| parent | 695786ad0fac01f3dff2232a187e95ab7ef864b0 (diff) | |
| download | meta-openembedded-e008cc8688504687b1e3a62a149a78d3da1375e7.tar.gz | |
systemd.bbclass: add option to disable automatic RRECOMMENDS pkg-systemd_base -> pkg-systemd
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd')
| -rw-r--r-- | 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 4036f91cad..96d7f8f559 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}'): |