aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-08-28 06:25:47 +0000
committerEric Bénard <eric@eukrea.com>2012-09-02 15:03:00 +0200
commit577943f85154be553b8133b3f2a13f53892152c4 (patch)
treee77df8b0b01f28b7bacd69bbe9cfd2d7a46e2a78
parent8e0c96b9abd568a942165d60edbf23971d552ac8 (diff)
downloadmeta-openembedded-577943f85154be553b8133b3f2a13f53892152c4.tar.gz
meta-openembedded-577943f85154be553b8133b3f2a13f53892152c4.tar.bz2
meta-openembedded-577943f85154be553b8133b3f2a13f53892152c4.zip
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 Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r--meta-oe/classes/systemd.bbclass9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 2e585c3ec..babe15e31 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 <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