diff --git a/lisa/_assets/binaries/x86_64/README.libtraceevent b/lisa/_assets/binaries/x86_64/README.libtraceevent index 554abcd099a241ebf895de5607f922c89cdfe6bd..ee6e68d8800bdbee42f6d265c1aedd40690e1439 100644 --- a/lisa/_assets/binaries/x86_64/README.libtraceevent +++ b/lisa/_assets/binaries/x86_64/README.libtraceevent @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.7 +VERSION_ID=3.16.8 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -21,13 +21,16 @@ export LISA_HOME='' export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash +# We are stuck at v3.16 for now since: +# * 3.17 does not have some static lib +# * 3.18 make hangs on some Makfiles: https://bugzilla.kernel.org/show_bug.cgi?id=218028 ALPINE_VERSION=v3.16 ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static zlib-dev zlib-static) BROKEN_CROSS_COMPILATION=1 download() { git clone git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git - git -C trace-cmd checkout trace-cmd-v3.1.5 + git -C trace-cmd checkout trace-cmd-v3.2 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git # Commit after 1.7.0 that fixes the raw trace-cmd output: @@ -54,7 +57,7 @@ build_tracecmd() { # All variables need to be exported, NOT SET ON THE CLI of make-trace-cmd.sh # itself. Otherwise they will internally conflict with existing ones. export LDFLAGS="-static" NO_AUDIT=yes NO_PYTHON=yes CFLAGS="-O3" - ./make-trace-cmd.sh install install_libs + ./make-trace-cmd.sh install strip "$TRACE_CMD_BIN" } diff --git a/lisa/_assets/binaries/x86_64/README.libtracefs b/lisa/_assets/binaries/x86_64/README.libtracefs index a33744e095f085cc0165bcc03e707ab0cee5f532..77f1d66b1c52b19e9bff8dceca13961cd4bcdeb8 100644 --- a/lisa/_assets/binaries/x86_64/README.libtracefs +++ b/lisa/_assets/binaries/x86_64/README.libtracefs @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.7 +VERSION_ID=3.16.8 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -21,13 +21,16 @@ export LISA_HOME='' export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash +# We are stuck at v3.16 for now since: +# * 3.17 does not have some static lib +# * 3.18 make hangs on some Makfiles: https://bugzilla.kernel.org/show_bug.cgi?id=218028 ALPINE_VERSION=v3.16 ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static zlib-dev zlib-static) BROKEN_CROSS_COMPILATION=1 download() { git clone git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git - git -C trace-cmd checkout trace-cmd-v3.1.5 + git -C trace-cmd checkout trace-cmd-v3.2 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git # Commit after 1.7.0 that fixes the raw trace-cmd output: @@ -54,7 +57,7 @@ build_tracecmd() { # All variables need to be exported, NOT SET ON THE CLI of make-trace-cmd.sh # itself. Otherwise they will internally conflict with existing ones. export LDFLAGS="-static" NO_AUDIT=yes NO_PYTHON=yes CFLAGS="-O3" - ./make-trace-cmd.sh install install_libs + ./make-trace-cmd.sh install strip "$TRACE_CMD_BIN" } diff --git a/lisa/_assets/binaries/x86_64/README.trace-cmd b/lisa/_assets/binaries/x86_64/README.trace-cmd index 95563e887da728ce23d568c1ccba207e0d774473..8692cc8f88cacebc3ee5c51b904b7d1c282b4f86 100644 --- a/lisa/_assets/binaries/x86_64/README.trace-cmd +++ b/lisa/_assets/binaries/x86_64/README.trace-cmd @@ -1,5 +1,5 @@ Sources of trace-cmd available at: -Git commit: 18f8a5b1aac64063b1c41dd3fa1a51e58f8ba229 +Git commit: 46952ef9aca9f6deeb9af7a227dfd1d04e147aba Git repository: git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.7 +VERSION_ID=3.16.8 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -21,13 +21,16 @@ export LISA_HOME='' export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash +# We are stuck at v3.16 for now since: +# * 3.17 does not have some static lib +# * 3.18 make hangs on some Makfiles: https://bugzilla.kernel.org/show_bug.cgi?id=218028 ALPINE_VERSION=v3.16 ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static zlib-dev zlib-static) BROKEN_CROSS_COMPILATION=1 download() { git clone git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git - git -C trace-cmd checkout trace-cmd-v3.1.5 + git -C trace-cmd checkout trace-cmd-v3.2 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git # Commit after 1.7.0 that fixes the raw trace-cmd output: @@ -54,7 +57,7 @@ build_tracecmd() { # All variables need to be exported, NOT SET ON THE CLI of make-trace-cmd.sh # itself. Otherwise they will internally conflict with existing ones. export LDFLAGS="-static" NO_AUDIT=yes NO_PYTHON=yes CFLAGS="-O3" - ./make-trace-cmd.sh install install_libs + ./make-trace-cmd.sh install strip "$TRACE_CMD_BIN" } diff --git a/lisa/_assets/binaries/x86_64/trace-cmd b/lisa/_assets/binaries/x86_64/trace-cmd index 1f1276dca1f56e308038b4ead6b666575af96b5f..81f34bb4c9a2cc188aa14614279c8c66c9b73153 100755 Binary files a/lisa/_assets/binaries/x86_64/trace-cmd and b/lisa/_assets/binaries/x86_64/trace-cmd differ diff --git a/tools/recipes/trace-cmd.recipe b/tools/recipes/trace-cmd.recipe index 3b6e91f82ac572becc893c06b9ac6e2f2e25a2cb..ce7504ac400f40dc1b2a46fc3373fd68a505868a 100644 --- a/tools/recipes/trace-cmd.recipe +++ b/tools/recipes/trace-cmd.recipe @@ -9,7 +9,7 @@ BROKEN_CROSS_COMPILATION=1 download() { git clone git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git - git -C trace-cmd checkout trace-cmd-v3.1.5 + git -C trace-cmd checkout trace-cmd-v3.2 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git # Commit after 1.7.0 that fixes the raw trace-cmd output: