[oe-commits] [meta-openembedded] 04/48: netcf_git: Check if src != dst while moving files.

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 51c03384a27907dd743b0af35437a1d3968322bf
Author: Amarnath Valluri <amarnath.valluri at intel.com>
AuthorDate: Thu Feb 23 11:05:38 2017 +0200

    netcf_git: Check if src != dst while moving files.
    
    Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-networking/recipes-support/netcf/netcf_git.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb b/meta-networking/recipes-support/netcf/netcf_git.bb
index 90c77c9..a7a5000 100644
--- a/meta-networking/recipes-support/netcf/netcf_git.bb
+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
@@ -47,9 +47,11 @@ do_install_append() {
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
        install -d ${D}${systemd_unitdir}/system
        if [ -d "${D}${libdir}/systemd/system" ]; then
-           mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
-           rm -rf ${D}${libdir}/systemd/
-       else
+           if [ "${systemd_unitdir}" != "${libdir}/systemd" ] ; then 
+               mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
+               rm -rf ${D}${libdir}/systemd/
+	   fi
+       elif [ "${systemd_unitdir}" != "${nonarch_libdir}/systemd" ] ; then 
            mv ${D}${nonarch_libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
            rm -rf ${D}${nonarch_libdir}/systemd/
        fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.