[oe-commits] Andreas Müller : systemd.bbclass: do not warn for systemd files are in ${PN}
git at git.openembedded.org
git at git.openembedded.org
Sun Sep 2 13:10:06 UTC 2012
Module: meta-openembedded.git
Branch: denzil-next
Commit: 577943f85154be553b8133b3f2a13f53892152c4
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=577943f85154be553b8133b3f2a13f53892152c4
Author: Andreas Müller <schnitzeltony at googlemail.com>
Date: Tue Aug 28 06:25:47 2012 +0000
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 at eukrea.com>
---
meta-oe/classes/systemd.bbclass | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 2e585c3..babe15e 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
More information about the Openembedded-commits
mailing list