[PATCH] systemtap: support usrmerge

[PATCH] systemtap: support usrmerge

[Alessio Igor Bogani]

Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
---
 meta/recipes-kernel/systemtap/systemtap_git.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 6ee3e1c0f7..2efba2e06f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -52,10 +52,13 @@ do_install_append () {
    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}`
+   if not ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+      install -d `dirname ${D}${systemd_unitdir}`
+      mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
+   fi
    rmdir ${D}${prefix}/lib --ignore-fail-on-non-empty
 
+
    # Ensure correct ownership for files copied in
    chown root:root ${D}${sysconfdir}/stap-exporter/* -R
 }
-- 
2.17.1

Re: [PATCH] systemtap: support usrmerge

[Mark Hatle]

On 10/23/19 3:25 PM, Alessio Igor Bogani wrote:
> Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
> ---
>  meta/recipes-kernel/systemtap/systemtap_git.bb | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
> index 6ee3e1c0f7..2efba2e06f 100644
> --- a/meta/recipes-kernel/systemtap/systemtap_git.bb
> +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
> @@ -52,10 +52,13 @@ do_install_append () {
>     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}`
> +   if not ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
> +      install -d `dirname ${D}${systemd_unitdir}`
> +      mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
> +   fi
>     rmdir ${D}${prefix}/lib --ignore-fail-on-non-empty

A better check out be:

if [ {D}${prefix}/lib/systemd != `dirname ${D}${systemd_unitdir}` ]; then
   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

This way the issue is resolved even if usrmerge isn't enabled, but the user
manually manipulated the paths.
> +
>     # Ensure correct ownership for files copied in
>     chown root:root ${D}${sysconfdir}/stap-exporter/* -R
>  }
> 

Re: [PATCH] systemtap: support usrmerge

[akuster808]

On 10/23/19 1:25 PM, Alessio Igor Bogani wrote:
> Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>

Thanks for the patch.  Could you comment on this open Yocto bug?
https://bugzilla.yoctoproject.org/show_bug.cgi?id=4442

I think its fixed but would like someone who is using it to comment.


- armin
> ---
>  meta/recipes-kernel/systemtap/systemtap_git.bb | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
> index 6ee3e1c0f7..2efba2e06f 100644
> --- a/meta/recipes-kernel/systemtap/systemtap_git.bb
> +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
> @@ -52,10 +52,13 @@ do_install_append () {
>     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}`
> +   if not ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
> +      install -d `dirname ${D}${systemd_unitdir}`
> +      mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
> +   fi
>     rmdir ${D}${prefix}/lib --ignore-fail-on-non-empty
>  
> +
>     # Ensure correct ownership for files copied in
>     chown root:root ${D}${sysconfdir}/stap-exporter/* -R
>  }

[PATCH v2] systemtap: support usrmerge

[Alessio Igor Bogani]

Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
---
 meta/recipes-kernel/systemtap/systemtap_git.bb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 6ee3e1c0f7..1c9f2aed16 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -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
-- 
2.17.1