From 577943f85154be553b8133b3f2a13f53892152c4 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 28 Aug 2012 06:25:47 +0000 Subject: systemd.bbclass: do not warn for systemd files are in ${PN} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we have our own layer there is no need to separate out systemd packages Signed-off-by: Eric Bénard --- meta-oe/classes/systemd.bbclass | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index 2e585c3eca..babe15e315 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/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 1.2.3-korg