mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
systemd.bbclass: do not warn for systemd files are in ${PN}
Since we have our own layer there is no need to separate out systemd packages
This commit is contained in:
committed by
Koen Kooi
parent
264e5a44e1
commit
8b774a53c0
@@ -46,18 +46,13 @@ def systemd_after_parse(d):
|
||||
if pkg_systemd.find("-systemd") == -1:
|
||||
if pkg_systemd != d.getVar('PN', 1):
|
||||
raise bb.build.FuncFailed, \
|
||||
"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \
|
||||
"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
|
||||
(bb_filename, pkg_systemd)
|
||||
else:
|
||||
# Only complain if recipe lacks native systemd support
|
||||
native_systemd_support = d.getVar('NATIVE_SYSTEMD_SUPPORT', 1) or ""
|
||||
if native_systemd_support == "":
|
||||
bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename)
|
||||
else:
|
||||
pkg_systemd_base = pkg_systemd.replace('-systemd', '')
|
||||
if pkg_systemd_base not in packages:
|
||||
raise bb.build.FuncFailed, \
|
||||
"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \
|
||||
"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
|
||||
( bb_filename, pkg_systemd)
|
||||
|
||||
# prepend systemd-packages not already included
|
||||
|
||||
Reference in New Issue
Block a user