summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-07-13 09:57:32 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2012-07-16 09:39:05 +0200
commit8b774a53c01243af14c50ee92c6c1c88462c7d47 (patch)
tree67ca20a0b5109d9a745d35e57bb90ec7a02c9420
parent264e5a44e1111f939b43c11bb9514a0b435918db (diff)
downloadmeta-openembedded-8b774a53c01243af14c50ee92c6c1c88462c7d47.tar.gz
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
-rw-r--r--meta-systemd/classes/systemd.bbclass9
1 files 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):
46 if pkg_systemd.find("-systemd") == -1: 46 if pkg_systemd.find("-systemd") == -1:
47 if pkg_systemd != d.getVar('PN', 1): 47 if pkg_systemd != d.getVar('PN', 1):
48 raise bb.build.FuncFailed, \ 48 raise bb.build.FuncFailed, \
49 "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ 49 "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
50 (bb_filename, pkg_systemd) 50 (bb_filename, pkg_systemd)
51 else:
52 # Only complain if recipe lacks native systemd support
53 native_systemd_support = d.getVar('NATIVE_SYSTEMD_SUPPORT', 1) or ""
54 if native_systemd_support == "":
55 bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename)
56 else: 51 else:
57 pkg_systemd_base = pkg_systemd.replace('-systemd', '') 52 pkg_systemd_base = pkg_systemd.replace('-systemd', '')
58 if pkg_systemd_base not in packages: 53 if pkg_systemd_base not in packages:
59 raise bb.build.FuncFailed, \ 54 raise bb.build.FuncFailed, \
60 "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ 55 "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
61 ( bb_filename, pkg_systemd) 56 ( bb_filename, pkg_systemd)
62 57
63 # prepend systemd-packages not already included 58 # prepend systemd-packages not already included