diff options
| author | Tom Rini <[email protected]> | 2025-11-26 15:52:00 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-12-01 09:17:48 -0600 |
| commit | 116e5a8466b11e9978404209951c017200a3f05d (patch) | |
| tree | 02d814efffda79cb76b66bcd9a52ffcb75202ee5 /tools | |
| parent | eee3ff60450a7f4720937c152b53bf2c51c1b3d2 (diff) | |
Dockerfile: Switch to distro-provided trace-cmd
Now that we have moved to Ubuntu 24.04 the distribution provided
trace-cmd is new enough for our needs. Switch to installing that and
stop building it from source.
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker/Dockerfile | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 63e21a31c71..03c623db3f7 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -141,6 +141,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ sudo \ swig \ texinfo \ + trace-cmd \ util-linux \ uuid-dev \ vboot-kernel-utils \ @@ -316,22 +317,6 @@ RUN git clone https://github.com/stefanberger/swtpm /tmp/swtpm && \ make install && \ rm -rf /tmp/swtpm -# Build trace-cmd -RUN mkdir /tmp/trace && \ - git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git /tmp/trace/libtraceevent && \ - cd /tmp/trace/libtraceevent && \ - make -j$(nproc) && \ - sudo make install && \ - git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git /tmp/trace/libtracefs && \ - cd /tmp/trace/libtracefs && \ - make -j$(nproc) && \ - sudo make install && \ - git clone https://github.com/rostedt/trace-cmd.git /tmp/trace/trace-cmd && \ - cd /tmp/trace/trace-cmd && \ - make -j$(nproc) && \ - sudo make install && \ - rm -rf /tmp/trace - # Build coreboot RUN wget -O - https://coreboot.org/releases/coreboot-25.03.tar.xz | tar -C /tmp -xJ && \ cd /tmp/coreboot-25.03 && \ |