diff --git a/lisa/_assets/binaries/arm64/README.libtraceevent b/lisa/_assets/binaries/arm64/README.libtraceevent index 7d039e2cd2999ba300859335a3e594580468e800..5473c2348956397460499522c4f844ae3c95239a 100644 --- a/lisa/_assets/binaries/arm64/README.libtraceevent +++ b/lisa/_assets/binaries/arm64/README.libtraceevent @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.3 +VERSION_ID=3.16.7 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -22,7 +22,7 @@ export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash ALPINE_VERSION=v3.16 -ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static) +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() { diff --git a/lisa/_assets/binaries/arm64/README.libtracefs b/lisa/_assets/binaries/arm64/README.libtracefs index eb0b67b1c39ee05dfc3f8aacbc9ad1935d5e8f41..8cee1ec06597474b0f08fbf2ca67382aba6a02d7 100644 --- a/lisa/_assets/binaries/arm64/README.libtracefs +++ b/lisa/_assets/binaries/arm64/README.libtracefs @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.3 +VERSION_ID=3.16.7 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -22,7 +22,7 @@ export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash ALPINE_VERSION=v3.16 -ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static) +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() { diff --git a/lisa/_assets/binaries/arm64/README.trace-cmd b/lisa/_assets/binaries/arm64/README.trace-cmd index fbaa019f4dd5d7cb99dc1542d095b67d056ff304..01231f5e67b0b9eec8d4d5a11d951732cdae2326 100644 --- a/lisa/_assets/binaries/arm64/README.trace-cmd +++ b/lisa/_assets/binaries/arm64/README.trace-cmd @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.3 +VERSION_ID=3.16.7 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -22,7 +22,7 @@ export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash ALPINE_VERSION=v3.16 -ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static) +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() { diff --git a/lisa/_assets/binaries/arm64/trace-cmd b/lisa/_assets/binaries/arm64/trace-cmd index 3b03f54ed5cebf350d67e26e124b0f44532c192b..2e7e973c7c67fab45c48f2c6950e1866a5be8a35 100755 Binary files a/lisa/_assets/binaries/arm64/trace-cmd and b/lisa/_assets/binaries/arm64/trace-cmd differ diff --git a/lisa/_assets/binaries/armeabi/README.libtraceevent b/lisa/_assets/binaries/armeabi/README.libtraceevent index 4311e81ee681297dcedf10c9d7ba2584e0b27935..bbf18e90305e913f5c425a62ac693e5c4df450d4 100644 --- a/lisa/_assets/binaries/armeabi/README.libtraceevent +++ b/lisa/_assets/binaries/armeabi/README.libtraceevent @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.3 +VERSION_ID=3.16.7 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -22,7 +22,7 @@ export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash ALPINE_VERSION=v3.16 -ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static) +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() { diff --git a/lisa/_assets/binaries/armeabi/README.libtracefs b/lisa/_assets/binaries/armeabi/README.libtracefs index bab37ac13f57e531a341e37f75b0d1bbcb386794..bbb0eb40da5e14f66b9f5f86b307a712547bf34d 100644 --- a/lisa/_assets/binaries/armeabi/README.libtracefs +++ b/lisa/_assets/binaries/armeabi/README.libtracefs @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.3 +VERSION_ID=3.16.7 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -22,7 +22,7 @@ export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash ALPINE_VERSION=v3.16 -ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static) +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() { diff --git a/lisa/_assets/binaries/armeabi/README.trace-cmd b/lisa/_assets/binaries/armeabi/README.trace-cmd index 2ccf8449241d1a52e5bb5738cd832e7308c2a25a..605e86ba5b4645481e8c0b6401618c15422bda6b 100644 --- a/lisa/_assets/binaries/armeabi/README.trace-cmd +++ b/lisa/_assets/binaries/armeabi/README.trace-cmd @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.3 +VERSION_ID=3.16.7 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -22,7 +22,7 @@ export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash ALPINE_VERSION=v3.16 -ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static) +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() { diff --git a/lisa/_assets/binaries/armeabi/trace-cmd b/lisa/_assets/binaries/armeabi/trace-cmd index d3e360e67333acb4f5ed521896533d397ebee663..552ad1f01e91141278d552679cdf987eebd478e7 100755 Binary files a/lisa/_assets/binaries/armeabi/trace-cmd and b/lisa/_assets/binaries/armeabi/trace-cmd differ diff --git a/lisa/_assets/binaries/x86_64/README.libtraceevent b/lisa/_assets/binaries/x86_64/README.libtraceevent index 7d1e79072a5d9871b172eba34508459dc2db4e6a..554abcd099a241ebf895de5607f922c89cdfe6bd 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.3 +VERSION_ID=3.16.7 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -22,7 +22,7 @@ export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash ALPINE_VERSION=v3.16 -ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static) +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() { diff --git a/lisa/_assets/binaries/x86_64/README.libtracefs b/lisa/_assets/binaries/x86_64/README.libtracefs index c01dc57fc93c142e923d3fb3a31456fcffe3b2ff..a33744e095f085cc0165bcc03e707ab0cee5f532 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.3 +VERSION_ID=3.16.7 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -22,7 +22,7 @@ export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash ALPINE_VERSION=v3.16 -ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static) +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() { diff --git a/lisa/_assets/binaries/x86_64/README.trace-cmd b/lisa/_assets/binaries/x86_64/README.trace-cmd index e20d5f1f1382f49ed9b1c4280c3b81e144b8aad2..95563e887da728ce23d568c1ccba207e0d774473 100644 --- a/lisa/_assets/binaries/x86_64/README.trace-cmd +++ b/lisa/_assets/binaries/x86_64/README.trace-cmd @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.3 +VERSION_ID=3.16.7 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -22,7 +22,7 @@ export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin #! /bin/bash ALPINE_VERSION=v3.16 -ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static) +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() { diff --git a/lisa/_assets/binaries/x86_64/trace-cmd b/lisa/_assets/binaries/x86_64/trace-cmd index 7c88499e3b10e263d7d58c78b1e99cd52c23d6d3..1f1276dca1f56e308038b4ead6b666575af96b5f 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 c96e49fc232f47dc81ebbafb39b89b9cfbf1f383..22f23a7760e43d308dd9d8862a2876ac31973de8 100644 --- a/tools/recipes/trace-cmd.recipe +++ b/tools/recipes/trace-cmd.recipe @@ -1,7 +1,10 @@ #! /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) +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() {