summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/systemtap
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-16 10:51:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-16 20:35:43 +0100
commit3b77e7b7852549dcfbc426d4ce258e6e857c0acd (patch)
tree73c39b2b4f650db5cbd7b51254ea44787c40d31b /meta/recipes-kernel/systemtap
parent5a0e22ebc93ed895f7b2cb3faab58c35dbab3e43 (diff)
downloadpoky-3b77e7b7852549dcfbc426d4ce258e6e857c0acd.tar.gz
systemtap: Fix issues from 4.0 upgrade
4.0 adds systemd support but installs the unit files in the wrong location. Fix this in do_install and inherit systemd to package them correctly. Also fix ownership of files manually copied in to root:root to avoid QA warnings. (From OE-Core rev: 74833a612cc383679bb5516e98c7508da47b0767) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap')
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb10
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 0b7833e901..3c45bfa937 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -25,7 +25,7 @@ PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3"
25PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c" 25PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c"
26PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native" 26PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native"
27 27
28inherit autotools gettext pkgconfig distutils3-base 28inherit autotools gettext pkgconfig distutils3-base systemd
29 29
30do_configure_prepend () { 30do_configure_prepend () {
31 # Improve reproducibility for c++ object files 31 # Improve reproducibility for c++ object files
@@ -39,6 +39,14 @@ do_install_append () {
39 rm -rf ${D}${datadir}/${PN} 39 rm -rf ${D}${datadir}/${PN}
40 rm ${D}${libexecdir}/${PN}/stap-env 40 rm ${D}${libexecdir}/${PN}/stap-env
41 fi 41 fi
42
43 # Fix makefile hardcoded path assumptions for systemd (assumes $prefix)
44 install -d `dirname ${D}${systemd_unitdir}`
45 mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
46 rmdir ${D}${prefix}/lib --ignore-fail-on-non-empty
47
48 # Ensure correct ownership for files copied in
49 chown root.root ${D}${sysconfdir}/stap-exporter/* -R
42} 50}
43 51
44BBCLASSEXTEND = "nativesdk" 52BBCLASSEXTEND = "nativesdk"