Patchwork [for-denzil,meta-oe,5/7] systemd.bbclass: do not warn for systemd files are in ${PN}

login
register
mail settings
Submitter Koen Kooi
Date Aug. 28, 2012, 6:25 a.m.
Message ID <1346135149-11256-5-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/35421/
State Accepted
Headers show

Comments

Koen Kooi - Aug. 28, 2012, 6:25 a.m.
From: Andreas Müller <schnitzeltony@googlemail.com>

Since we have our own layer there is no need to separate out systemd packages
---
 meta-oe/classes/systemd.bbclass |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

Patch

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