diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb')
-rw-r--r-- | import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb index ed713ace2..a7a5000e2 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb @@ -20,7 +20,7 @@ inherit gettext autotools pkgconfig systemd EXTRA_OECONF_append_class-target = " --with-driver=redhat" -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," do_configure_prepend() { @@ -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 |