File tree Expand file tree Collapse file tree 5 files changed +99
-5
lines changed
infra/base-images/base-builder Expand file tree Collapse file tree 5 files changed +99
-5
lines changed Original file line number Diff line number Diff line change 1414#
1515# ###############################################################################
1616
17- name : ' Check Ubuntu Config Sync'
17+ name : ' Ubuntu Version Sync'
1818
1919on :
2020 pull_request :
5454
5555 declare -A LEGACY_SCRIPTS
5656 LEGACY_SCRIPTS["infra/base-images/base-builder-fuzzbench/fuzzbench_install_dependencies"]="infra/base-images/base-builder-fuzzbench/fuzzbench_install_dependencies_{version}"
57+ LEGACY_SCRIPTS["infra/base-images/base-builder/install_deps.sh"]="infra/base-images/base-builder/install_deps_{version}.sh"
5758 LEGACY_SCRIPTS["infra/base-images/base-builder/install_swift.sh"]="infra/base-images/base-builder/install_swift_{version}.sh"
5859 LEGACY_SCRIPTS["infra/base-images/base-builder/precompile_honggfuzz"]="infra/base-images/base-builder/precompile_honggfuzz_{version}"
5960 LEGACY_SCRIPTS["infra/base-images/base-clang/checkout_build_install_llvm.sh"]="infra/base-images/base-clang/checkout_build_install_llvm_{version}.sh"
Original file line number Diff line number Diff line change 1+ #! /bin/bash -eux
2+ # Copyright 2022 Google LLC
3+ #
4+ # Licensed under the Apache License, Version 2.0 (the "License");
5+ # you may not use this file except in compliance with the License.
6+ # You may obtain a copy of the License at
7+ #
8+ # http://www.apache.org/licenses/LICENSE-2.0
9+ #
10+ # Unless required by applicable law or agreed to in writing, software
11+ # distributed under the License is distributed on an "AS IS" BASIS,
12+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ # See the License for the specific language governing permissions and
14+ # limitations under the License.
15+ #
16+ # ###############################################################################
17+
18+ # Install base-builder's dependencies in a architecture-aware way.
19+
20+
21+ case $( uname -m) in
22+ x86_64)
23+ dpkg --add-architecture i386
24+ ;;
25+ esac
26+
27+ apt-get update && \
28+ apt-get install -y \
29+ binutils-dev \
30+ build-essential \
31+ curl \
32+ wget \
33+ git \
34+ jq \
35+ patchelf \
36+ rsync \
37+ subversion \
38+ zip
39+
40+ case $( uname -m) in
41+ x86_64)
42+ apt-get install -y libc6-dev-i386
43+ ;;
44+ esac
Original file line number Diff line number Diff line change 1+ #! /bin/bash -eux
2+ # Copyright 2022 Google LLC
3+ #
4+ # Licensed under the Apache License, Version 2.0 (the "License");
5+ # you may not use this file except in compliance with the License.
6+ # You may obtain a copy of the License at
7+ #
8+ # http://www.apache.org/licenses/LICENSE-2.0
9+ #
10+ # Unless required by applicable law or agreed to in writing, software
11+ # distributed under the License is distributed on an "AS IS" BASIS,
12+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ # See the License for the specific language governing permissions and
14+ # limitations under the License.
15+ #
16+ # ###############################################################################
17+
18+ # Install base-builder's dependencies in a architecture-aware way.
19+
20+
21+ case $( uname -m) in
22+ x86_64)
23+ dpkg --add-architecture i386
24+ ;;
25+ esac
26+
27+ apt-get update && \
28+ apt-get install -y \
29+ binutils-dev \
30+ build-essential \
31+ curl \
32+ wget \
33+ git \
34+ jq \
35+ patchelf \
36+ rsync \
37+ subversion \
38+ zip
39+
40+ case $( uname -m) in
41+ x86_64)
42+ apt-get install -y libc6-dev-i386
43+ ;;
44+ esac
45+
46+ # Ubuntu 24.04 does not have lcab. Install an older .deb from Ubuntu repos.
47+ curl -LO https://mirrors.edge.kernel.org/ubuntu/pool/universe/l/lcab/lcab_1.0b12-7_amd64.deb && \
48+ apt-get install -y ./lcab_1.0b12-7_amd64.deb && \
49+ rm lcab_1.0b12-7_amd64.deb
Original file line number Diff line number Diff line change 1616
1717FROM gcr.io/oss-fuzz-base/base-clang:ubuntu-20-04
1818
19- COPY install_deps .sh /
20- RUN /install_deps.sh && rm /install_deps .sh
19+ COPY install_deps_ubuntu-20-04.sh install_swift_ubuntu_20_04 .sh /
20+ RUN /install_deps_ubuntu-20-04 .sh
2121
2222# Build and install latest Python 3.11.
2323ENV PYTHON_VERSION 3.11.13
Original file line number Diff line number Diff line change 1616
1717FROM gcr.io/oss-fuzz-base/base-clang:ubuntu-24-04
1818
19- COPY install_deps .sh /
20- RUN /install_deps.sh && rm /install_deps .sh
19+ COPY install_deps_ubuntu-24-04.sh install_swift_ubuntu_24_04 .sh /
20+ RUN /install_deps_ubuntu-24-04 .sh
2121
2222# Build and install latest Python 3.11.
2323ENV PYTHON_VERSION 3.11.13
You can’t perform that action at this time.
0 commit comments