diff options
author | Yann Dirson <yann@blade-group.com> | 2020-11-12 18:26:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-13 14:32:00 +0000 |
commit | c606515ab5abbd694680c4977784ffe5a2e7ce6a (patch) | |
tree | 6139f05039cdfc43834bae9ed3ff838c207151e9 /meta/recipes-kernel/systemtap/systemtap_git.bb | |
parent | fc556f5e520a3f762099e03e781399e9eced5a6a (diff) | |
download | poky-c606515ab5abbd694680c4977784ffe5a2e7ce6a.tar.gz |
systemtap: fix install when python3-probes is disabled in PACKAGECONFIG
(From OE-Core rev: 75bca65ccdfe05da434a5c2b561e13f623499d53)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap_git.bb')
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 89f550c859..74bf7cb35c 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb | |||
@@ -66,7 +66,7 @@ do_install_append () { | |||
66 | rm ${D}${libexecdir}/${PN}/stap-env | 66 | rm ${D}${libexecdir}/${PN}/stap-env |
67 | fi | 67 | fi |
68 | 68 | ||
69 | if [ ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then | 69 | if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then |
70 | # Fix makefile hardcoded path assumptions for systemd (assumes $prefix) | 70 | # Fix makefile hardcoded path assumptions for systemd (assumes $prefix) |
71 | # without usrmerge distro feature enabled | 71 | # without usrmerge distro feature enabled |
72 | install -d `dirname ${D}${systemd_unitdir}` | 72 | install -d `dirname ${D}${systemd_unitdir}` |
@@ -75,7 +75,9 @@ do_install_append () { | |||
75 | fi | 75 | fi |
76 | 76 | ||
77 | # Ensure correct ownership for files copied in | 77 | # Ensure correct ownership for files copied in |
78 | chown root:root ${D}${sysconfdir}/stap-exporter/* -R | 78 | if [ -d ${D}${sysconfdir}/stap-exporter ]; then |
79 | chown root:root ${D}${sysconfdir}/stap-exporter/* -R | ||
80 | fi | ||
79 | } | 81 | } |
80 | 82 | ||
81 | BBCLASSEXTEND = "nativesdk" | 83 | BBCLASSEXTEND = "nativesdk" |