[PATCH] systemtap: Fix issues from 4.0 upgrade

[PATCH] systemtap: Fix issues from 4.0 upgrade

[Richard Purdie]

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-kernel/systemtap/systemtap_git.bb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 0b7833e901b..3c45bfa9374 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"
 PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c"
 PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native"
 
-inherit autotools gettext pkgconfig distutils3-base
+inherit autotools gettext pkgconfig distutils3-base systemd
 
 do_configure_prepend () {
     # Improve reproducibility for c++ object files
@@ -39,6 +39,14 @@ do_install_append () {
       rm -rf ${D}${datadir}/${PN}
       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
+
+   # Ensure correct ownership for files copied in
+   chown root.root ${D}${sysconfdir}/stap-exporter/* -R
 }
 
 BBCLASSEXTEND = "nativesdk"
-- 
2.17.1

Re: [PATCH] systemtap: Fix issues from 4.0 upgrade

[Martin Hundebøll]

Hi Richard,

On 16/10/2018 21.25, Richard Purdie wrote:
> 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.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>   meta/recipes-kernel/systemtap/systemtap_git.bb | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
> index 0b7833e901b..3c45bfa9374 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"
>   PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c"
>   PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native"
>   
> -inherit autotools gettext pkgconfig distutils3-base
> +inherit autotools gettext pkgconfig distutils3-base systemd
>   
>   do_configure_prepend () {
>       # Improve reproducibility for c++ object files
> @@ -39,6 +39,14 @@ do_install_append () {
>         rm -rf ${D}${datadir}/${PN}
>         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
> +
> +   # Ensure correct ownership for files copied in
> +   chown root.root ${D}${sysconfdir}/stap-exporter/* -R

root:root ?

>   }
>   
>   BBCLASSEXTEND = "nativesdk"
> 

-- 
Kind regards,
Martin Hundebøll
Embedded Linux Consultant

+45 61 65 54 61
martin@geanix.com

Geanix IVS
https://geanix.com
DK39600706

Re: [PATCH] systemtap: Fix issues from 4.0 upgrade

[richard.purdie]

On Wed, 2018-10-17 at 10:29 +0200, Martin Hundebøll wrote:
> On 16/10/2018 21.25, Richard Purdie wrote:
> > +
> > +   # 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
> > +
> > +   # Ensure correct ownership for files copied in
> > +   chown root.root ${D}${sysconfdir}/stap-exporter/* -R
> 
> root:root ?

Well spotted, thanks!

Cheers,

Richard