[1/3] lttng: Enable on musl and riscv

Submitted by Khem Raj on March 18, 2019, 4:58 p.m. | Patch ID: 159643

Details

Message ID 20190318165803.10375-1-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj March 18, 2019, 4:58 p.m.
Latest version compiles on musl as well as on risv64 now

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb | 2 +-
 meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb b/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
index 086254d3d3..15e75e51c9 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
@@ -9,7 +9,7 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3 \
 
 inherit module
 
-COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
+COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux'
 
 #https://lttng.org/files/lttng-modules/lttng-modules-2.10.7.tar.bz2
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
index 151e35e3c3..d544f8e206 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
@@ -26,9 +26,7 @@  PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig
 PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust"
 PACKAGECONFIG[kmod] = "--with-kmod, --without-kmod, kmod"
 PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
-PACKAGECONFIG_remove_libc-musl = "lttng-ust"
 PACKAGECONFIG_remove_arc = "lttng-ust"
-PACKAGECONFIG_remove_riscv64 = "lttng-ust"
 
 SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
            file://x32.patch \

Comments

Jonathan Rajotte-Julien March 18, 2019, 5:08 p.m.
Hi Khem,

This looks good, still please take some moment to read this thread from musl
mailing list regarding lttng-ust usage of _SC_NPROCESSORS_CONF. For now I would
maintain the disabling of lttng-ust when musl is used. I should have CC'ed you,
I forgot.

The modification for riscv64 seems good to me. We do support lttng-* for
riscv64 [2] on debian.

[1] https://www.openwall.com/lists/musl/2019/03/15/5
[2] https://packages.debian.org/sid/utils/lttng-tools


On Mon, Mar 18, 2019 at 09:58:01AM -0700, Khem Raj wrote:
> Latest version compiles on musl as well as on risv64 now
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb | 2 +-
>  meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb   | 2 --
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb b/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
> index 086254d3d3..15e75e51c9 100644
> --- a/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
> @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3 \
>  
>  inherit module
>  
> -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
> +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux'
>  
>  #https://lttng.org/files/lttng-modules/lttng-modules-2.10.7.tar.bz2
>  SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> index 151e35e3c3..d544f8e206 100644
> --- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> @@ -26,9 +26,7 @@ PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig
>  PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust"
>  PACKAGECONFIG[kmod] = "--with-kmod, --without-kmod, kmod"
>  PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
> -PACKAGECONFIG_remove_libc-musl = "lttng-ust"
>  PACKAGECONFIG_remove_arc = "lttng-ust"
> -PACKAGECONFIG_remove_riscv64 = "lttng-ust"
>  
>  SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
>             file://x32.patch \
> -- 
> 2.21.0
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj March 18, 2019, 5:12 p.m.
On Mon, Mar 18, 2019 at 10:08 AM Jonathan Rajotte-Julien
<jonathan.rajotte-julien@efficios.com> wrote:
>
> Hi Khem,
>
> This looks good, still please take some moment to read this thread from musl
> mailing list regarding lttng-ust usage of _SC_NPROCESSORS_CONF. For now I would
> maintain the disabling of lttng-ust when musl is used. I should have CC'ed you,
> I forgot.

I think thats right, I should keep this pull just to riscv for now. I
will send a v2 soonish

>
> The modification for riscv64 seems good to me. We do support lttng-* for
> riscv64 [2] on debian.
>
> [1] https://www.openwall.com/lists/musl/2019/03/15/5
> [2] https://packages.debian.org/sid/utils/lttng-tools
>
>
> On Mon, Mar 18, 2019 at 09:58:01AM -0700, Khem Raj wrote:
> > Latest version compiles on musl as well as on risv64 now
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb | 2 +-
> >  meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb   | 2 --
> >  2 files changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb b/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
> > index 086254d3d3..15e75e51c9 100644
> > --- a/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
> > +++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
> > @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3 \
> >
> >  inherit module
> >
> > -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
> > +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux'
> >
> >  #https://lttng.org/files/lttng-modules/lttng-modules-2.10.7.tar.bz2
> >  SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
> > diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> > index 151e35e3c3..d544f8e206 100644
> > --- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> > +++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> > @@ -26,9 +26,7 @@ PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig
> >  PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust"
> >  PACKAGECONFIG[kmod] = "--with-kmod, --without-kmod, kmod"
> >  PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
> > -PACKAGECONFIG_remove_libc-musl = "lttng-ust"
> >  PACKAGECONFIG_remove_arc = "lttng-ust"
> > -PACKAGECONFIG_remove_riscv64 = "lttng-ust"
> >
> >  SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
> >             file://x32.patch \
> > --
> > 2.21.0
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Jonathan Rajotte-Julien
> EfficiOS