[oe-commits] Robert Yang : nss-myhostname: skip it when systemd

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: da70a62d456f7efac379381c2c431cc4ded877e9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=da70a62d456f7efac379381c2c431cc4ded877e9

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Thu Oct  9 02:39:09 2014 -0700

nss-myhostname: skip it when systemd

Fixed error when systemd is in DISTRO_FEATURES:
ERROR: The recipe systemd is trying to install files into a sharedarea when those files already exist. Those files and their manifestlocation are:
   /path/to/sysroots/qemux86/usr/lib/libnss_myhostname.so.2
 Matched in manifest-qemux86-nss-myhostname.populate_sysroot
Please verify which recipe should provide theabove files.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>

---

 meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
index 1237602..bbce9e9 100644
--- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
+++ b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
@@ -11,7 +11,10 @@ SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${P
 SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f"
 SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2"
 
-inherit autotools
+inherit autotools distro_features_check
+
+# The systemd has its own copy of nss-myhostname
+CONFLICT_DISTRO_FEATURES = "systemd"
 
 pkg_postinst_${PN} () {
 	sed -e '/^hosts:/s/\s*\<myhostname\>//' \