helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-28 23:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd.bbclass: add option to disable automatic RRECOMMENDS pkg-systemd_base -> pkg-systemd

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2012-08-16 13:51:35 +02:00
parent 695786ad0f
commit e008cc8688
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-systemd/classes/systemd.bbclass
View File

@ -2,6 +2,8 @@ DEPENDS_append = " systemd-systemctl-native"
SYSTEMD_AUTO_ENABLE ??= "enable" SYSTEMD_AUTO_ENABLE ??= "enable"
SYSTEMD_AUTO_RRECOMMENDS ??= "enable"
systemd_postinst() { systemd_postinst() {
OPTS="" 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: if len(rdepends_arr) == 0 and pkg_systemd != '${PN}' and not pkg_systemd_base in rdepends:
rdepends = '%s %s' % (rdepends, pkg_systemd_base) rdepends = '%s %s' % (rdepends, pkg_systemd_base)
d.setVar('RDEPENDS_' + pkg_systemd, rdepends) d.setVar('RDEPENDS_' + pkg_systemd, rdepends)
# RRECOMMENDS_${pkg_systemd_base} += pkg_systemd systemd auto_rrecommends = d.getVar('SYSTEMD_AUTO_RRECOMMENDS', 1) or 'enable'
rrecommends = d.getVar('RRECOMMENDS_' + pkg_systemd_base, 1) or "" if auto_rrecommends == 'enable':
# not rrecommending myself AND avoid double entries # RRECOMMENDS_${pkg_systemd_base} += pkg_systemd systemd
if pkg_systemd != pkg_systemd_base and not pkg_systemd in rrecommends.split(): rrecommends = d.getVar('RRECOMMENDS_' + pkg_systemd_base, 1) or ""
rrecommends = '%s %s' % (rrecommends, pkg_systemd) # not rrecommending myself AND avoid double entries
d.setVar('RRECOMMENDS_' + pkg_systemd_base, rrecommends) 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 # run all modifications once when creating package
if os.path.exists('${D}'): if os.path.exists('${D}'):