From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 15 Sep 2014 07:44:21 +0000 (+0800)
Subject: acpid: use ${PN} for SYSTEMD_SERVICE
X-Git-Tag: 2015-4~1484
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f8217853c69cf06c92b2f3885f7d49851213188f;p=openembedded-core.git

acpid: use ${PN} for SYSTEMD_SERVICE

We should use ${PN} instead of 'acpid' for SYSTEMD_SERVICE, otherwise
we would have the 'installed-not-shipped' QA error if multilib is enabled
and we run `bitbake lib32-acpid'.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
index 9b4c3a5a5d..e0156192a0 100644
--- a/meta/recipes-bsp/acpid/acpid.inc
+++ b/meta/recipes-bsp/acpid/acpid.inc
@@ -14,8 +14,7 @@ inherit autotools update-rc.d systemd
 INITSCRIPT_NAME = "acpid"
 INITSCRIPT_PARAMS = "defaults"
 
-SYSTEMD_PACKAGES = "acpid"
-SYSTEMD_SERVICE_acpid = "acpid.service"
+SYSTEMD_SERVICE_${PN} = "acpid.service"
 
 do_install_append () {
 	install -d ${D}${sysconfdir}/init.d