diff --git a/lisa/_assets/binaries/arm64/README.libtraceevent b/lisa/_assets/binaries/arm64/README.libtraceevent index 5473c2348956397460499522c4f844ae3c95239a..fa4f1cbc5d0c07a675a6777d8fa1c651a4bb9117 100644 --- a/lisa/_assets/binaries/arm64/README.libtraceevent +++ b/lisa/_assets/binaries/arm64/README.libtraceevent @@ -1,5 +1,5 @@ Sources of libtraceevent available at: -Git commit: 0c28cec1e409653095dea0511c24fd9849b2862f +Git commit: 2f7cfddd8068de199cbc24d8411bbc0c1f97ed2f Git repository: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git @@ -7,8 +7,8 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.7 -PRETTY_NAME="Alpine Linux v3.16" +VERSION_ID=3.21.0 +PRETTY_NAME="Alpine Linux v3.21" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -18,24 +18,21 @@ Build recipe: export ARCH=arm64 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/arm64 export LISA_HOME='' -export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin #! /bin/bash -ALPINE_VERSION=v3.16 +ALPINE_VERSION=v3.21 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.3.1 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Commit after 1.7.0 that fixes the raw trace-cmd output: - # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f + git -C libtraceevent checkout libtraceevent #-1.8.4 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git - git -C libtracefs checkout libtracefs-1.6.3 + git -C libtracefs checkout libtracefs #-1.8.1 } build_libtraceevent() { @@ -54,7 +51,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 V=1 install strip "$TRACE_CMD_BIN" } @@ -679,6 +676,7 @@ Kylie McClain Leah Neukirchen Luca Barbato Luka Perkov +Lynn Ochs M Farkas-Dyck (Strake) Mahesh Bodapati Markus Wichmann @@ -708,7 +706,6 @@ Stefan O'Rear Szabolcs Nagy Timo Teräs Trutz Behn -Valentin Ochs Will Dietz William Haddon William Pitcock @@ -748,7 +745,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/README.libtracefs b/lisa/_assets/binaries/arm64/README.libtracefs index 8cee1ec06597474b0f08fbf2ca67382aba6a02d7..bd2440553df8643c2a6a36cbff29da1c63dd3559 100644 --- a/lisa/_assets/binaries/arm64/README.libtracefs +++ b/lisa/_assets/binaries/arm64/README.libtracefs @@ -1,5 +1,5 @@ Sources of libtracefs available at: -Git commit: 3395d484eadfd8ab38311032f28e7f79c4f0e33b +Git commit: a2bfb49ff5bc05c425b2a417edcfe78b14cf4057 Git repository: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git @@ -7,8 +7,8 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.7 -PRETTY_NAME="Alpine Linux v3.16" +VERSION_ID=3.21.0 +PRETTY_NAME="Alpine Linux v3.21" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -18,24 +18,21 @@ Build recipe: export ARCH=arm64 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/arm64 export LISA_HOME='' -export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin #! /bin/bash -ALPINE_VERSION=v3.16 +ALPINE_VERSION=v3.21 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.3.1 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Commit after 1.7.0 that fixes the raw trace-cmd output: - # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f + git -C libtraceevent checkout libtraceevent #-1.8.4 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git - git -C libtracefs checkout libtracefs-1.6.3 + git -C libtracefs checkout libtracefs #-1.8.1 } build_libtraceevent() { @@ -54,7 +51,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 V=1 install strip "$TRACE_CMD_BIN" } @@ -679,6 +676,7 @@ Kylie McClain Leah Neukirchen Luca Barbato Luka Perkov +Lynn Ochs M Farkas-Dyck (Strake) Mahesh Bodapati Markus Wichmann @@ -708,7 +706,6 @@ Stefan O'Rear Szabolcs Nagy Timo Teräs Trutz Behn -Valentin Ochs Will Dietz William Haddon William Pitcock @@ -748,7 +745,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/README.trace-cmd b/lisa/_assets/binaries/arm64/README.trace-cmd index 01231f5e67b0b9eec8d4d5a11d951732cdae2326..c8f10c588359541d9faf1a422d6de35f70961f11 100644 --- a/lisa/_assets/binaries/arm64/README.trace-cmd +++ b/lisa/_assets/binaries/arm64/README.trace-cmd @@ -1,5 +1,5 @@ Sources of trace-cmd available at: -Git commit: 18f8a5b1aac64063b1c41dd3fa1a51e58f8ba229 +Git commit: 5f20c4770b6ca280999e553c54afb58f03bd9c4f Git repository: git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git @@ -7,8 +7,8 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.7 -PRETTY_NAME="Alpine Linux v3.16" +VERSION_ID=3.21.0 +PRETTY_NAME="Alpine Linux v3.21" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -18,24 +18,21 @@ Build recipe: export ARCH=arm64 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/arm64 export LISA_HOME='' -export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin #! /bin/bash -ALPINE_VERSION=v3.16 +ALPINE_VERSION=v3.21 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.3.1 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Commit after 1.7.0 that fixes the raw trace-cmd output: - # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f + git -C libtraceevent checkout libtraceevent #-1.8.4 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git - git -C libtracefs checkout libtracefs-1.6.3 + git -C libtracefs checkout libtracefs #-1.8.1 } build_libtraceevent() { @@ -54,7 +51,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 V=1 install strip "$TRACE_CMD_BIN" } @@ -535,6 +532,7 @@ Kylie McClain Leah Neukirchen Luca Barbato Luka Perkov +Lynn Ochs M Farkas-Dyck (Strake) Mahesh Bodapati Markus Wichmann @@ -564,7 +562,6 @@ Stefan O'Rear Szabolcs Nagy Timo Teräs Trutz Behn -Valentin Ochs Will Dietz William Haddon William Pitcock @@ -604,7 +601,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-cmd b/lisa/_assets/binaries/arm64/trace-cmd index 2e7e973c7c67fab45c48f2c6950e1866a5be8a35..9c3b8eee56a78bedf1478541f7dd462d69f51927 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/x86_64/README.libtraceevent b/lisa/_assets/binaries/x86_64/README.libtraceevent index 554abcd099a241ebf895de5607f922c89cdfe6bd..73b98e9bb5cedc2a39d4f869c882dc7268739c1e 100644 --- a/lisa/_assets/binaries/x86_64/README.libtraceevent +++ b/lisa/_assets/binaries/x86_64/README.libtraceevent @@ -1,5 +1,5 @@ Sources of libtraceevent available at: -Git commit: 0c28cec1e409653095dea0511c24fd9849b2862f +Git commit: 2f7cfddd8068de199cbc24d8411bbc0c1f97ed2f Git repository: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git @@ -7,8 +7,8 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.7 -PRETTY_NAME="Alpine Linux v3.16" +VERSION_ID=3.21.0 +PRETTY_NAME="Alpine Linux v3.21" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -18,24 +18,21 @@ Build recipe: export ARCH=x86_64 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/x86_64 export LISA_HOME='' -export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin #! /bin/bash -ALPINE_VERSION=v3.16 +ALPINE_VERSION=v3.21 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.3.1 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Commit after 1.7.0 that fixes the raw trace-cmd output: - # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f + git -C libtraceevent checkout libtraceevent #-1.8.4 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git - git -C libtracefs checkout libtracefs-1.6.3 + git -C libtracefs checkout libtracefs #-1.8.1 } build_libtraceevent() { @@ -54,7 +51,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 V=1 install strip "$TRACE_CMD_BIN" } @@ -679,6 +676,7 @@ Kylie McClain Leah Neukirchen Luca Barbato Luka Perkov +Lynn Ochs M Farkas-Dyck (Strake) Mahesh Bodapati Markus Wichmann @@ -708,7 +706,6 @@ Stefan O'Rear Szabolcs Nagy Timo Teräs Trutz Behn -Valentin Ochs Will Dietz William Haddon William Pitcock @@ -748,7 +745,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/README.libtracefs b/lisa/_assets/binaries/x86_64/README.libtracefs index a33744e095f085cc0165bcc03e707ab0cee5f532..156b57f25faeb393ec3bbe6942e584add010ddc9 100644 --- a/lisa/_assets/binaries/x86_64/README.libtracefs +++ b/lisa/_assets/binaries/x86_64/README.libtracefs @@ -1,5 +1,5 @@ Sources of libtracefs available at: -Git commit: 3395d484eadfd8ab38311032f28e7f79c4f0e33b +Git commit: a2bfb49ff5bc05c425b2a417edcfe78b14cf4057 Git repository: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git @@ -7,8 +7,8 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.7 -PRETTY_NAME="Alpine Linux v3.16" +VERSION_ID=3.21.0 +PRETTY_NAME="Alpine Linux v3.21" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -18,24 +18,21 @@ Build recipe: export ARCH=x86_64 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/x86_64 export LISA_HOME='' -export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin #! /bin/bash -ALPINE_VERSION=v3.16 +ALPINE_VERSION=v3.21 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.3.1 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Commit after 1.7.0 that fixes the raw trace-cmd output: - # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f + git -C libtraceevent checkout libtraceevent #-1.8.4 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git - git -C libtracefs checkout libtracefs-1.6.3 + git -C libtracefs checkout libtracefs #-1.8.1 } build_libtraceevent() { @@ -54,7 +51,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 V=1 install strip "$TRACE_CMD_BIN" } @@ -679,6 +676,7 @@ Kylie McClain Leah Neukirchen Luca Barbato Luka Perkov +Lynn Ochs M Farkas-Dyck (Strake) Mahesh Bodapati Markus Wichmann @@ -708,7 +706,6 @@ Stefan O'Rear Szabolcs Nagy Timo Teräs Trutz Behn -Valentin Ochs Will Dietz William Haddon William Pitcock @@ -748,7 +745,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/README.trace-cmd b/lisa/_assets/binaries/x86_64/README.trace-cmd index 95563e887da728ce23d568c1ccba207e0d774473..0f20a001bd723aa72afdc256c1a30140a35ce296 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: 5f20c4770b6ca280999e553c54afb58f03bd9c4f Git repository: git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git @@ -7,8 +7,8 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.7 -PRETTY_NAME="Alpine Linux v3.16" +VERSION_ID=3.21.0 +PRETTY_NAME="Alpine Linux v3.21" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -18,24 +18,21 @@ Build recipe: export ARCH=x86_64 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/x86_64 export LISA_HOME='' -export PATH=/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin #! /bin/bash -ALPINE_VERSION=v3.16 +ALPINE_VERSION=v3.21 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.3.1 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Commit after 1.7.0 that fixes the raw trace-cmd output: - # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f + git -C libtraceevent checkout libtraceevent #-1.8.4 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git - git -C libtracefs checkout libtracefs-1.6.3 + git -C libtracefs checkout libtracefs #-1.8.1 } build_libtraceevent() { @@ -54,7 +51,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 V=1 install strip "$TRACE_CMD_BIN" } @@ -535,6 +532,7 @@ Kylie McClain Leah Neukirchen Luca Barbato Luka Perkov +Lynn Ochs M Farkas-Dyck (Strake) Mahesh Bodapati Markus Wichmann @@ -564,7 +562,6 @@ Stefan O'Rear Szabolcs Nagy Timo Teräs Trutz Behn -Valentin Ochs Will Dietz William Haddon William Pitcock @@ -604,7 +601,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-cmd b/lisa/_assets/binaries/x86_64/trace-cmd index 1f1276dca1f56e308038b4ead6b666575af96b5f..d9565f7c890391583644b6008d07637a5f216ea2 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 3573965dbc16055e630f43094377698c2dbdd77b..d37cbaf8fcb792fcaebd5dc690a1e7e90aadb29f 100644 --- a/tools/recipes/trace-cmd.recipe +++ b/tools/recipes/trace-cmd.recipe @@ -1,22 +1,17 @@ #! /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_VERSION=v3.21 ALPINE_BUILD_DEPENDENCIES=(bash gcc git make linux-headers musl-dev pkgconfig bison flex zstd-dev zstd-static zlib-dev zlib-static) 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.3.1 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Commit after 1.7.0 that fixes the raw trace-cmd output: - # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f + git -C libtraceevent checkout libtraceevent #-1.8.4 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git - git -C libtracefs checkout libtracefs-1.6.3 + git -C libtracefs checkout libtracefs #-1.8.1 } build_libtraceevent() { @@ -35,7 +30,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 + ./make-trace-cmd.sh V=1 install strip "$TRACE_CMD_BIN" }