Skip to contentSkip to conversation

lttng: Enable on musl and riscv

PATCH Superseded Khem Raj 2 participants 8 messages Mar 18, 2019 – Mar 19, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 lttng: Enable on musl and riscv

Latest version compiles on musl as well as on risv64 now

---
 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(-)
meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb +1 -1
index 086254d3d3..15e75e51c9 100644
@@ -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 \
meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb +0 -2
index 151e35e3c3..d544f8e206 100644
@@ -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 \
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH 2/3 packagegroup-core-tools-profile: Do not remove lttng-ust for musl and risc-v

---
 .../packagegroups/packagegroup-core-tools-profile.bb           | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +0 -3
index 762c046636..3d8e0c2ed7 100644
@@ -39,16 +39,13 @@ SYSTEMTAP_riscv64 = ""
 LTTNGUST = "lttng-ust"
 LTTNGUST_libc-musl = ""
 LTTNGUST_arc = ""
-LTTNGUST_riscv64 = ""
 
 LTTNGTOOLS = "lttng-tools"
 LTTNGTOOLS_libc-musl = ""
 LTTNGTOOLS_arc = ""
-LTTNGTOOLS_riscv64 = ""
 
 LTTNGMODULES = "lttng-modules"
 LTTNGMODULES_arc = ""
-LTTNGMODULES_riscv64 = ""
 
 BABELTRACE = "babeltrace"
 
Signature · 1 line
2.21.0
#2 lore raw

Re: [PATCH 2/3] packagegroup-core-tools-profile: Do not remove lttng-ust for musl and risc-v

meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb SYSTEMTAP_riscv64 = "" · line 40

Quoted 12 lines · Khem Raj
---
 .../packagegroups/packagegroup-core-tools-profile.bb           | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +0 -0
index 762c046636..3d8e0c2ed7 100644
@@ -39,16 +39,13 @@ SYSTEMTAP_riscv64 = ""
 LTTNGUST = "lttng-ust"
 LTTNGUST_libc-musl = ""

Looks like you missed this, based on the commit msg.

meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb SYSTEMTAP_riscv64 = "" · line 44

Quoted 5 lines
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +0 -1
 LTTNGUST_arc = ""
-LTTNGUST_riscv64 = ""
 
 LTTNGTOOLS = "lttng-tools"
 LTTNGTOOLS_libc-musl = ""

Looks like you missed this, based on the commit msg.

Quoted 17 lines
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +0 -2
 LTTNGTOOLS_arc = ""
-LTTNGTOOLS_riscv64 = ""
 
 LTTNGMODULES = "lttng-modules"
 LTTNGMODULES_arc = ""
-LTTNGMODULES_riscv64 = ""
 
 BABELTRACE = "babeltrace"
 
Signature · 7 lines
2.21.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
Jonathan Rajotte-Julien
EfficiOS
author
#3 lore raw

PATCH 3/3 gdb: Do not disable lttng-ust on risc-v

In reply to Khem Raj
---
 meta/recipes-devtools/gdb/gdb-common.inc | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-devtools/gdb/gdb-common.inc +0 -1
index 57bc0dc773..a07625bb8d 100644
@@ -6,7 +6,6 @@ DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
 LTTNGUST = "lttng-ust"
 LTTNGUST_arc = ""
 LTTNGUST_aarch64 = ""
-LTTNGUST_riscv64 = ""
 LTTNGUST_mipsarch = ""
 LTTNGUST_sh4 = ""
 LTTNGUST_libc-musl = ""
Signature · 1 line
2.21.0
#4 lore raw

Re: [PATCH 3/3] gdb: Do not disable lttng-ust on risc-v

meta/recipes-devtools/gdb/gdb-common.inc DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" · line 6

Quoted 11 lines · Khem Raj
---
 meta/recipes-devtools/gdb/gdb-common.inc | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-devtools/gdb/gdb-common.inc +0 -0
index 57bc0dc773..a07625bb8d 100644
@@ -6,7 +6,6 @@ DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
 LTTNGUST = "lttng-ust"

I did not know that gdb depends on lttng-ust, I know gdb can depend on libbabeltrace*. I'll check that a bit more.

Cheers.

Quoted 14 lines
meta/recipes-devtools/gdb/gdb-common.inc +0 -1
 LTTNGUST_arc = ""
 LTTNGUST_aarch64 = ""
-LTTNGUST_riscv64 = ""
 LTTNGUST_mipsarch = ""
 LTTNGUST_sh4 = ""
 LTTNGUST_libc-musl = ""
Signature · 7 lines
2.21.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
Jonathan Rajotte-Julien
EfficiOS
#5 lore raw

Re: [PATCH 3/3] gdb: Do not disable lttng-ust on risc-v

Hi Khem,

Quoted 6 lines · Jonathan Rajotte-Julien
Quoted 5 lines · Khem Raj
---
 meta/recipes-devtools/gdb/gdb-common.inc | 1 -
 1 file changed, 1 deletion(-)
Quoted 9 lines

meta/recipes-devtools/gdb/gdb-common.inc DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" · line 6

Quoted 6 lines
meta/recipes-devtools/gdb/gdb-common.inc +0 -0
index 57bc0dc773..a07625bb8d 100644
@@ -6,7 +6,6 @@ DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
 LTTNGUST = "lttng-ust"

I did not know that gdb depends on lttng-ust, I know gdb can depend on libbabeltrace*. I'll check that a bit more.

Gdb can indeed depend on lttng-ust for gdbserver for tracpoint.

This answer my question.

Quoted 26 lines

Cheers.

Quoted 14 lines
meta/recipes-devtools/gdb/gdb-common.inc +0 -1
 LTTNGUST_arc = ""
 LTTNGUST_aarch64 = ""
-LTTNGUST_riscv64 = ""
 LTTNGUST_mipsarch = ""
 LTTNGUST_sh4 = ""
 LTTNGUST_libc-musl = ""
Signature · 7 lines
2.21.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 7 lines
Jonathan Rajotte-Julien
EfficiOS
-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
Jonathan Rajotte-Julien
EfficiOS
#6 lore raw
In reply to Khem Raj

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

Quoted 43 lines · Khem Raj

Latest version compiles on musl as well as on risv64 now

---
 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(-)
meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb +1 -1
index 086254d3d3..15e75e51c9 100644
@@ -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 \
meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb +0 -2
index 151e35e3c3..d544f8e206 100644
@@ -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 \
Signature · 7 lines
2.21.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
Jonathan Rajotte-Julien
EfficiOS
author
#7 lore raw
Quoted 7 lines · Jonathan Rajotte-Julien

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

Quoted 56 lines

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

Quoted 38 lines · Khem Raj

Latest version compiles on musl as well as on risv64 now

---
 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(-)
meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb +1 -1
index 086254d3d3..15e75e51c9 100644
@@ -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 \
meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb +0 -3
index 151e35e3c3..d544f8e206 100644
@@ -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

Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
Jonathan Rajotte-Julien
EfficiOS