[meta-oe][PATCH 1/2] mariadb: use ${PN} for SYSTEMD_SERVICE

[meta-oe][PATCH 1/2] mariadb: use ${PN} for SYSTEMD_SERVICE

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

Use ${PN} for SYSTEMD_SERVICE to avoid errors in case of multilib.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta-oe/recipes-support/mysql/mariadb_5.5.39.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc b/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc
index 9cc2cc9..4d7499d 100644
--- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc
+++ b/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc
@@ -29,8 +29,8 @@ USERADD_PACKAGES = "${PN}-server"
 USERADD_PARAM_${PN}-server = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql"
 GROUPADD_PARAM_${PN}-server = "--system mysql"
 
-SYSTEMD_PACKAGES = "mariadb-server"
-SYSTEMD_SERVICE_mariadb-server = "mysqld.service"
+SYSTEMD_PACKAGES = "${PN}-server"
+SYSTEMD_SERVICE_${PN}-server = "mysqld.service"
 SYSTEMD_AUTO_ENABLE_mariadb-server = "disable"
 
 EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
-- 
1.7.9.5

[meta-oe][PATCH 2/2] hostapd: use ${PN} for SYSTEMD_SERVICE

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

Use ${PN} for SYSTEMD_SERVICE to avoid errors in case of multilib.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../recipes-connectivity/hostapd/hostapd_2.2.bb    |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb
index f1c6b3a..b75f2b9 100644
--- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb
@@ -7,9 +7,9 @@ SUMMARY = "User space daemon for extended IEEE 802.11 management"
 
 inherit update-rc.d systemd
 INITSCRIPT_NAME = "hostapd"
-SYSTEMD_PACKAGES = "hostapd"
-SYSTEMD_SERVICE_hostapd = "hostapd.service"
-SYSTEMD_AUTO_ENABLE_hostapd = "disable"
+
+SYSTEMD_SERVICE_${PN} = "hostapd.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "disable"
 
 DEFAULT_PREFERENCE = "-1"
 
-- 
1.7.9.5