Skip to content

Commit eef7124

Browse files
committed
setup-build-env: consolidate package dependencies
BPF CI self-hosted runner docker images moved to using setup-build-env scripts at build time [1]. Consolidate the list of packages to install in the action script. Signed-off-by: Ihor Solodrai <[email protected]>
1 parent badd512 commit eef7124

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

setup-build-env/install_clang.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ source "${THISDIR}"/../helpers.sh
66

77
foldable start install_clang "Install LLVM ${LLVM_VERSION}"
88

9+
sudo apt-get update -y
10+
sudo -E apt-get install --no-install-recommends -y \
11+
gnupg lsb-release software-properties-common wget
12+
913
curl -O https://apt.llvm.org/llvm.sh
1014
chmod +x llvm.sh
1115
sudo ./llvm.sh ${LLVM_VERSION}

setup-build-env/install_packages.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,20 @@ foldable start install_packages
1212

1313
sudo apt-get update -y
1414

15-
sudo -E apt-get install --no-install-recommends -y \
16-
bc binutils-dev bison build-essential cmake curl elfutils flex \
17-
libcap-dev libdw-dev libelf-dev libguestfs-tools libpcap-dev \
18-
libssl-dev libzstd-dev ncurses-dev pkg-config python3-docutils \
19-
qemu-kvm qemu-utils rsync texinfo tzdata xz-utils zstd
15+
sudo -E apt-get install --no-install-recommends -y \
16+
bc bison build-essential cmake cpu-checker curl dumb-init \
17+
elfutils ethtool ethtool flex gawk git iproute2 iptables \
18+
iputils-ping jq keyutils libguestfs-tools pkg-config \
19+
python3-docutils python3-minimal rsync software-properties-common \
20+
sudo texinfo tree tzdata wget xz-utils zstd
21+
22+
sudo -E apt-get install --no-install-recommends -y \
23+
binutils-dev libcap-dev libdw-dev libelf-dev libpcap-dev \
24+
libssl-dev libzstd-dev ncurses-dev
25+
26+
sudo -E apt-get install --no-install-recommends -y \
27+
qemu-guest-agent qemu-kvm qemu-system-arm qemu-system-s390x \
28+
qemu-system-x86 qemu-utils
2029

2130
sudo apt-get install -y gcc-${GCC_VERSION} g++-${GCC_VERSION}
2231
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 10

0 commit comments

Comments
 (0)