diff --git a/lisa/_assets/binaries/arm64/README.trace-dump b/lisa/_assets/binaries/arm64/README.trace-dump index d82c82d49a56a9fc742aff087f19d50038696df7..ec9e5d8f996bbdd965e47191bb5e962892ed8a16 100644 --- a/lisa/_assets/binaries/arm64/README.trace-dump +++ b/lisa/_assets/binaries/arm64/README.trace-dump @@ -7,8 +7,8 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.20.0 -PRETTY_NAME="Alpine Linux v3.20" +VERSION_ID=3.22.0 +PRETTY_NAME="Alpine Linux v3.22" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -21,7 +21,7 @@ export LISA_BUILD_ENV=alpine export LISA_HOME='' #! /bin/bash -ALPINE_VERSION=v3.20 +ALPINE_VERSION=v3.22.0 ALPINE_BUILD_DEPENDENCIES=(bash git curl musl-dev clang lld) BROKEN_CROSS_COMPILATION=0 @@ -64,7 +64,8 @@ install_rust() { build_tracedump() { cd trace-parser/trace-tools && - time RUSTFLAGS="$RUSTFLAGS -C target-feature=+crt-static" cargo build --profile release-lisa --target="$(make_triplet)" + export RUSTC_BOOTSTRAP=1 + time RUSTFLAGS="$RUSTFLAGS -C target-feature=+crt-static" cargo build --locked --profile release-lisa --target="$(make_triplet)" } download() { @@ -373,6 +374,7 @@ Kylie McClain Leah Neukirchen Luca Barbato Luka Perkov +Lynn Ochs M Farkas-Dyck (Strake) Mahesh Bodapati Markus Wichmann @@ -402,7 +404,6 @@ Stefan O'Rear Szabolcs Nagy Timo Teräs Trutz Behn -Valentin Ochs Will Dietz William Haddon William Pitcock @@ -442,7 +443,7 @@ domain. The code also comes with a fallback permissive license for use in jurisdictions that may not recognize the public domain. The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011 -Valentin Ochs and is licensed under an MIT-style license. +Lynn Ochs and is licensed under an MIT-style license. The x86_64 port was written by Nicholas J. Kain and is licensed under the standard MIT terms. diff --git a/lisa/_assets/binaries/arm64/trace-dump b/lisa/_assets/binaries/arm64/trace-dump index 1c732db98ad876d414ac20d51456c25caae10dd4..61638c2369f9e19e6e0120d3ddab18351039b48f 100755 Binary files a/lisa/_assets/binaries/arm64/trace-dump and b/lisa/_assets/binaries/arm64/trace-dump differ diff --git a/lisa/_assets/binaries/x86_64/README.trace-dump b/lisa/_assets/binaries/x86_64/README.trace-dump index 7767ee53856835ac264199d4503c7ee9597e6f84..9d78675ce6629a966c1742f892824dc024314c6b 100644 --- a/lisa/_assets/binaries/x86_64/README.trace-dump +++ b/lisa/_assets/binaries/x86_64/README.trace-dump @@ -7,8 +7,8 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.20.0 -PRETTY_NAME="Alpine Linux v3.20" +VERSION_ID=3.22.0 +PRETTY_NAME="Alpine Linux v3.22" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -21,7 +21,7 @@ export LISA_BUILD_ENV=alpine export LISA_HOME='' #! /bin/bash -ALPINE_VERSION=v3.20 +ALPINE_VERSION=v3.22.0 ALPINE_BUILD_DEPENDENCIES=(bash git curl musl-dev clang lld) BROKEN_CROSS_COMPILATION=0 @@ -64,7 +64,8 @@ install_rust() { build_tracedump() { cd trace-parser/trace-tools && - time RUSTFLAGS="$RUSTFLAGS -C target-feature=+crt-static" cargo build --profile release-lisa --target="$(make_triplet)" + export RUSTC_BOOTSTRAP=1 + time RUSTFLAGS="$RUSTFLAGS -C target-feature=+crt-static" cargo build --locked --profile release-lisa --target="$(make_triplet)" } download() { @@ -373,6 +374,7 @@ Kylie McClain Leah Neukirchen Luca Barbato Luka Perkov +Lynn Ochs M Farkas-Dyck (Strake) Mahesh Bodapati Markus Wichmann @@ -402,7 +404,6 @@ Stefan O'Rear Szabolcs Nagy Timo Teräs Trutz Behn -Valentin Ochs Will Dietz William Haddon William Pitcock @@ -442,7 +443,7 @@ domain. The code also comes with a fallback permissive license for use in jurisdictions that may not recognize the public domain. The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011 -Valentin Ochs and is licensed under an MIT-style license. +Lynn Ochs and is licensed under an MIT-style license. The x86_64 port was written by Nicholas J. Kain and is licensed under the standard MIT terms. diff --git a/lisa/_assets/binaries/x86_64/trace-dump b/lisa/_assets/binaries/x86_64/trace-dump index c0db52c6a50e047cb4a398fe0ba48e9685bb0290..7dbae3946bf1ad48e15f7275915b98156209a211 100755 Binary files a/lisa/_assets/binaries/x86_64/trace-dump and b/lisa/_assets/binaries/x86_64/trace-dump differ diff --git a/tests/test_trace.py b/tests/test_trace.py index 04fb7039262c2ce7019401dfecd4659bd27d0b3a..60f2e26aa86cad26641e5a64b9777c953e964399 100644 --- a/tests/test_trace.py +++ b/tests/test_trace.py @@ -389,7 +389,7 @@ class TraceTestCase(StorageTestCase): def test_metadata_symbols_address(self): trace = self.get_trace('doc') syms = trace.get_metadata('symbols-address') - assert len(syms) == 138329 + assert len(syms) == 166443 assert all( isinstance(key, int) and isinstance(value, str) for key, value in syms.items() diff --git a/tools/recipes/trace-tools.recipe b/tools/recipes/trace-tools.recipe index 160adaf36446afb307f395edec95b3af6eebe9c2..8dd9f5d6ac4d215c7b7a5461bf903e92a3fc9e24 100644 --- a/tools/recipes/trace-tools.recipe +++ b/tools/recipes/trace-tools.recipe @@ -1,6 +1,6 @@ #! /bin/bash -ALPINE_VERSION=v3.21.3 +ALPINE_VERSION=v3.22.0 ALPINE_BUILD_DEPENDENCIES=(bash git curl musl-dev clang lld) BROKEN_CROSS_COMPILATION=0