From c606515ab5abbd694680c4977784ffe5a2e7ce6a Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Thu, 12 Nov 2020 18:26:15 +0100 Subject: systemtap: fix install when python3-probes is disabled in PACKAGECONFIG (From OE-Core rev: 75bca65ccdfe05da434a5c2b561e13f623499d53) Signed-off-by: Richard Purdie --- meta/recipes-kernel/systemtap/systemtap_git.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-kernel/systemtap') 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 () { rm ${D}${libexecdir}/${PN}/stap-env fi - if [ ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then + if [ -d ${D}${prefix}/lib/systemd -a ${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}` @@ -75,7 +75,9 @@ do_install_append () { fi # Ensure correct ownership for files copied in - chown root:root ${D}${sysconfdir}/stap-exporter/* -R + if [ -d ${D}${sysconfdir}/stap-exporter ]; then + chown root:root ${D}${sysconfdir}/stap-exporter/* -R + fi } BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3-54-g00ecf