diff options
| author | Tom Rini <[email protected]> | 2025-11-26 10:21:54 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-26 10:21:54 -0600 |
| commit | 4dfa4c14b8e5b37885f9eb281b3bc230938c5972 (patch) | |
| tree | f7af11b3bbd2ba2ee125927177ac5ae5ad5ecfb2 /tools/docker | |
| parent | bc4a1e56bfcdd70a5307c91c94dafcf6bb27da93 (diff) | |
Dockerfile: Update building trace tools slightly
We have not been picking a tag for the trace-cmd build process.
Currently the tip of libtraceevent fails to build. Address both problems
here by picking recent stable tags for libtraceevent and libtracefs
(trace-cmd has no recent tags). Further, as it is often reported that
this fails to build due to a race, stop using "make -j$(nproc)" as this
is also small enough of a set of builds to not be an issue.
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'tools/docker')
| -rw-r--r-- | tools/docker/Dockerfile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index f98b42e7357..960e4a7177f 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -311,17 +311,19 @@ RUN git clone https://github.com/stefanberger/swtpm /tmp/swtpm && \ # Build trace-cmd RUN mkdir /tmp/trace && \ - git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git /tmp/trace/libtraceevent && \ + git clone --depth=1 https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git /tmp/trace/libtraceevent \ + -b libtraceevent-1.8.6 && \ cd /tmp/trace/libtraceevent && \ - make -j$(nproc) && \ + make && \ sudo make install && \ - git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git /tmp/trace/libtracefs && \ + git clone --depth=1 https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git /tmp/trace/libtracefs \ + -b libtracefs-1.8.2 && \ cd /tmp/trace/libtracefs && \ - make -j$(nproc) && \ + make && \ sudo make install && \ git clone https://github.com/rostedt/trace-cmd.git /tmp/trace/trace-cmd && \ cd /tmp/trace/trace-cmd && \ - make -j$(nproc) && \ + make && \ sudo make install && \ rm -rf /tmp/trace |