Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ PERF_LINUX_VERSION := 6.1.52
perf:
wget https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$(PERF_LINUX_VERSION).tar.xz
tar -xf linux-$(PERF_LINUX_VERSION).tar.xz && mv linux-$(PERF_LINUX_VERSION)/ linux_perf/
cd linux_perf/tools/perf && make LDFLAGS="-static --static"
cd linux_perf/tools/perf && make LDFLAGS="-static --static" BUILD_BPF_SKEL=1 NO_JVMTI=1

spectre-meltdown-checker:
ifeq ("$(wildcard spectre-meltdown-checker)","")
Expand Down
7 changes: 5 additions & 2 deletions tools/build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# build output oss_source* will be in workdir
# build image (from project root directory):
# $ docker build -f tools/build.Dockerfile --tag perfspect-tools:$TAG ./tools
FROM ubuntu:18.04 AS builder
FROM ubuntu:22.04 AS builder
ENV http_proxy=${http_proxy}
ENV https_proxy=${https_proxy}
ENV LANG=en_US.UTF-8
Expand All @@ -16,7 +16,10 @@ RUN locale-gen en_US.UTF-8 && echo "LANG=en_US.UTF-8" > /etc/default/locale
RUN add-apt-repository ppa:git-core/ppa -y
RUN apt-get update && apt-get install -y git build-essential autotools-dev automake \
gawk zlib1g-dev libtool libaio-dev libaio1 pandoc pkgconf libcap-dev docbook-utils \
libreadline-dev default-jre default-jdk cmake flex bison libssl-dev
libreadline-dev default-jre default-jdk cmake flex bison libssl-dev clang libbpf-dev \
libdw-dev systemtap-sdt-dev libunwind-dev libslang2-dev python2-dev binutils-dev \
liblzma-dev libzstd-dev libnuma-dev libbabeltrace-dev llvm-13
RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"

ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64

Expand Down
Loading