From: Herve Jourdain <herve.jourdain@neuf.fr>
Date: Mon, 7 Mar 2016 15:59:32 +0000 (+0100)
Subject: systemd: binfmt should be added to SYSTEMD_PACKAGES only if binfmt is enabled
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~26646
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa8856d39e149854e43bd0a6cd28a277288a8fc0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

systemd: binfmt should be added to SYSTEMD_PACKAGES only if binfmt is enabled

Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/systemd/systemd_229.bb b/meta/recipes-core/systemd/systemd_229.bb
index 16af0acc3b6..cd483609c14 100644
--- a/meta/recipes-core/systemd/systemd_229.bb
+++ b/meta/recipes-core/systemd/systemd_229.bb
@@ -298,7 +298,7 @@ PACKAGES =+ "\
     ${PN}-extra-utils \
 "
 
-SYSTEMD_PACKAGES = "${PN}-binfmt"
+SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)}"
 SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
 
 USERADD_PACKAGES = "${PN}"