From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][meta-systemd][PATCH] systemd.bbclass: add option to disable automatic RRECOMMENDS pkg-systemd_base -> pkg-systemd
Date: Thu, 16 Aug 2012 16:07:46 +0200 [thread overview]
Message-ID: <1345126066-1406-1-git-send-email-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <20120716182528.GO3729@jama.jama.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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}'):
--
1.7.8.6
next prev parent reply other threads:[~2012-08-16 14:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120716074256.12AC410334@opal>
2012-07-16 18:25 ` [oe-commits] Andreas Müller : systemd.bbclass: add *-systemd packages to RRECOMMENDS Martin Jansa
2012-07-17 8:54 ` Andreas Müller
2012-07-17 9:18 ` Martin Jansa
2012-07-17 9:23 ` Koen Kooi
2012-07-18 12:31 ` Martin Jansa
2012-07-18 14:21 ` Andreas Müller
2012-07-18 14:28 ` Martin Jansa
2012-07-18 14:35 ` Andreas Müller
2012-07-18 14:38 ` Martin Jansa
2012-08-16 14:07 ` Martin Jansa [this message]
2012-08-16 14:53 ` [meta-oe][meta-systemd][PATCH] systemd.bbclass: add option to disable automatic RRECOMMENDS pkg-systemd_base -> pkg-systemd Andreas Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345126066-1406-1-git-send-email-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox