[PATCH 1/2] systemd: use ${BPN} instead of ${PN} in FILES

[PATCH 1/2] systemd: use ${BPN} instead of ${PN} in FILES

[Ross Burton]

Otherwise in multlib builds the wrong name is used and files don't get packaged
correctly.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/systemd/systemd_199.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_199.bb b/meta/recipes-core/systemd/systemd_199.bb
index 3ee1283..2de9c14 100644
--- a/meta/recipes-core/systemd/systemd_199.bb
+++ b/meta/recipes-core/systemd/systemd_199.bb
@@ -149,7 +149,7 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${datadir}/dbus-1/services \
                 ${datadir}/dbus-1/system-services \
                 ${datadir}/polkit-1 \
-                ${datadir}/${PN} \
+                ${datadir}/${BPN} \
                 ${sysconfdir}/bash_completion.d/ \
                 ${sysconfdir}/binfmt.d/ \
                 ${sysconfdir}/dbus-1/ \
-- 
1.7.10.4

[PATCH 2/2] util-linux: use $PN in SYSTEMD_PACKAGES

[Ross Burton]

Instead of using util-linux-uuidd in SYSTEMD_PACKAGES use ${PN}-uuidd, as in
multilib configurations util-linux-uuidd doesn't exist.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index dd9c546..4f4b770 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -93,7 +93,7 @@ RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-l
 RRECOMMENDS_${PN}_class-native = ""
 RDEPENDS_${PN}_class-native = ""
 
-SYSTEMD_PACKAGES = "util-linux-uuidd"
+SYSTEMD_PACKAGES = "${PN}-uuidd"
 SYSTEMD_SERVICE_util-linux-uuidd = "uuidd.service"
 
 do_compile () {
-- 
1.7.10.4