mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
systemtap: support usrmerge
(From OE-Core rev: a732bd776717f14a7b47c0e0ba096b8921dff16d) Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
29b733d7b8
commit
02951c25c9
@@ -51,10 +51,13 @@ do_install_append () {
|
||||
rm ${D}${libexecdir}/${PN}/stap-env
|
||||
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}`
|
||||
rmdir ${D}${prefix}/lib --ignore-fail-on-non-empty
|
||||
if [ ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then
|
||||
# Fix makefile hardcoded path assumptions for systemd (assumes $prefix)
|
||||
# without usrmerge distro feature enabled
|
||||
install -d `dirname ${D}${systemd_unitdir}`
|
||||
mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
|
||||
rmdir ${D}${prefix}/lib --ignore-fail-on-non-empty
|
||||
fi
|
||||
|
||||
# Ensure correct ownership for files copied in
|
||||
chown root:root ${D}${sysconfdir}/stap-exporter/* -R
|
||||
|
||||
Reference in New Issue
Block a user