summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 6ee3e1c0f7..1c9f2aed16 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -51,10 +51,13 @@ do_install_append () {
51 rm ${D}${libexecdir}/${PN}/stap-env 51 rm ${D}${libexecdir}/${PN}/stap-env
52 fi 52 fi
53 53
54 # Fix makefile hardcoded path assumptions for systemd (assumes $prefix) 54 if [ ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then
55 install -d `dirname ${D}${systemd_unitdir}` 55 # Fix makefile hardcoded path assumptions for systemd (assumes $prefix)
56 mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}` 56 # without usrmerge distro feature enabled
57 rmdir ${D}${prefix}/lib --ignore-fail-on-non-empty 57 install -d `dirname ${D}${systemd_unitdir}`
58 mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
59 rmdir ${D}${prefix}/lib --ignore-fail-on-non-empty
60 fi
58 61
59 # Ensure correct ownership for files copied in 62 # Ensure correct ownership for files copied in
60 chown root:root ${D}${sysconfdir}/stap-exporter/* -R 63 chown root:root ${D}${sysconfdir}/stap-exporter/* -R