From 8b774a53c01243af14c50ee92c6c1c88462c7d47 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 13 Jul 2012 09:57:32 +0200 Subject: 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 --- meta-systemd/classes/systemd.bbclass | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass index fce314da83..8af0d58cf9 100644 --- a/meta-systemd/classes/systemd.bbclass +++ b/meta-systemd/classes/systemd.bbclass @@ -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 -systemd or ${PN} (deprecated)" % \ + "\n\n%s: %s in SYSTEMD_PACKAGES does not match -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 -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 -systemd or ${PN} (deprecated)" % \ + "\n\n%s: %s in SYSTEMD_PACKAGES does not match -systemd or ${PN}" % \ ( bb_filename, pkg_systemd) # prepend systemd-packages not already included -- cgit v1.2.3-54-g00ecf