[OE-core] [PATCH] systemtap: support usrmerge

[Alessio Igor Bogani]

Signed-off-by: Alessio Igor Bogani <alessio.bogani at elettra.eu>
---
 meta/recipes-kernel/systemtap/systemtap_git.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 6ee3e1c0f7..2efba2e06f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -52,10 +52,13 @@ do_install_append () {
    fi
 
    # Fix makefile hardcoded path assumptions for systemd (assumes $prefix)
-   install -d `dirname ${D}${systemd_unitdir}`
-   mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
+   if not ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+      install -d `dirname ${D}${systemd_unitdir}`
+      mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
+   fi
    rmdir ${D}${prefix}/lib --ignore-fail-on-non-empty
 
+
    # Ensure correct ownership for files copied in
    chown root:root ${D}${sysconfdir}/stap-exporter/* -R
 }
-- 
2.17.1