public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: "Yann Dirson" <yann.dirson@blade-group.com>
To: openembedded-core@lists.openembedded.org
Cc: Yann Dirson <yann@blade-group.com>
Subject: [PATCH v2 4/5] systemtap: fix install when python3-probes is disabled in PACKAGECONFIG
Date: Thu, 12 Nov 2020 18:26:15 +0100	[thread overview]
Message-ID: <20201112172616.784945-5-yann@blade-group.com> (raw)
In-Reply-To: <20201112172616.784945-1-yann@blade-group.com>

From: Yann Dirson <yann@blade-group.com>

---
 meta/recipes-kernel/systemtap/systemtap_git.bb | 6 ++++--
 1 file 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 () {
       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"
-- 
2.28.0


  parent reply	other threads:[~2020-11-12 17:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-12 17:26 [PATCH v2 0/5] systemtap improvements Yann Dirson
2020-11-12 17:26 ` [PATCH v2 1/5] systemtap: split examples and python scripts out of main package Yann Dirson
2020-11-12 17:26 ` [PATCH v2 2/5] systemtap: remove extra dependencies Yann Dirson
2020-11-12 17:26 ` [PATCH v2 3/5] systemtap: clarify the relation between exporter and python3-probes feature Yann Dirson
2020-11-12 17:26 ` Yann Dirson [this message]
2020-11-12 17:26 ` [PATCH v2 5/5] systemtap: split runtime material in its own package Yann Dirson
     [not found] ` <CAHSqoWsCZbE03tuDsfEnwxSCGddUuti_GAAF_ga6e-ozKXK3Ew@mail.gmail.com>
     [not found]   ` <CA+4=imb5WUKYxKg1qwy-k0dUGApzCYwEskddGhVfyovGnSePew@mail.gmail.com>
     [not found]     ` <CA+4=imZPuimbfuxLGnjYyy=sWoX3qWbavMk3+vnEqbJXizQWXQ@mail.gmail.com>
2020-11-17  4:34       ` [OE-core] [PATCH v2 0/5] systemtap improvements victor.kamensky7
2020-11-17  9:24         ` Richard Purdie
2020-12-02 11:16           ` Yann Dirson
2020-11-17  9:50         ` Yann Dirson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201112172616.784945-5-yann@blade-group.com \
    --to=yann.dirson@blade-group.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=yann@blade-group.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox