diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-08-28 06:25:47 +0000 |
---|---|---|
committer | Eric Bénard <eric@eukrea.com> | 2012-09-02 15:03:00 +0200 |
commit | 577943f85154be553b8133b3f2a13f53892152c4 (patch) | |
tree | e77df8b0b01f28b7bacd69bbe9cfd2d7a46e2a78 | |
parent | 8e0c96b9abd568a942165d60edbf23971d552ac8 (diff) | |
download | meta-openembedded-577943f85154be553b8133b3f2a13f53892152c4.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
Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r-- | 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 2e585c3ec..babe15e31 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/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 |