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

systemd.bbclass: automatically extend RDEPENDS for *-systemd packages

Browse Source 
* append systemd functionalty moved into systemd_add_rdepends
* append base-pgk in case receipe does not set RDEPENDS for *-systemd package

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Andreas Müller 2012-02-22 16:03:20 +01:00 committed by Koen Kooi
parent 4c66cea579
commit 114cefffb9
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meta-oe/classes/systemd.bbclass
View File

@ -122,10 +122,6 @@ python populate_packages_prepend () {
postrm += bb.data.getVar('systemd_postrm', localdata, 1) postrm += bb.data.getVar('systemd_postrm', localdata, 1)
bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
rdepends.append("systemd")
bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d)
# add files to FILES_*-systemd if existent and not already done # add files to FILES_*-systemd if existent and not already done
def systemd_append_file(pkg_systemd, file_append): def systemd_append_file(pkg_systemd, file_append):
appended = False appended = False
@ -185,10 +181,27 @@ python populate_packages_prepend () {
raise bb.build.FuncFailed, "\n\nFor package %s SYSTEMD_SERVICE-entry %s does not exist" % \ raise bb.build.FuncFailed, "\n\nFor package %s SYSTEMD_SERVICE-entry %s does not exist" % \
(pkg_systemd, service) (pkg_systemd, service)
# *-systemd packages get RDEPENDS to systemd and their base package
def systemd_add_rdepends(pkg_systemd):
# RDEPENDS_${pkg_systemd} += pkg_systemd_base systemd
rdepends = d.getVar('RDEPENDS_' + pkg_systemd, 1) or ""
rdepends_arr = rdepends.split()
if not 'systemd' in rdepends_arr:
rdepends = '%s %s' % (rdepends, 'systemd')
pkg_systemd_base = pkg_systemd.replace('-systemd', '')
# no automatism for:
# recipes setting rdepends themselves AND
# not rdepending myself AND
# avoid double entries
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)
# run all modifications once when creating package # run all modifications once when creating package
if os.path.exists('${D}'): if os.path.exists('${D}'):
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
systemd_generate_package_scripts(pkg_systemd) systemd_generate_package_scripts(pkg_systemd)
systemd_add_rdepends(pkg_systemd)
systemd_check_services() systemd_check_services()
} }