Skip to content

Commit c6c5ab9

Browse files
committed
infra: parent_image=ubuntu:24.04
This requires a workaround for honggfuzz. Also, use the new lib32gcc-s1 package name.
1 parent e65fc73 commit c6c5ab9

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

infra/base-images/base-builder/precompile_honggfuzz

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ make clean
3333
# These CFLAGs match honggfuzz's default, with the exception of -mtune to
3434
# improve portability and `-D_HF_LINUX_NO_BFD` to remove assembly instructions
3535
# from the filenames.
36-
CC=clang CFLAGS="-O3 -funroll-loops -D_HF_LINUX_NO_BFD" make
36+
#
37+
# The LDFLAGS disable pie to work around a linker error that happens after a
38+
# base-image bump from ubuntu:20.04.
39+
CC=clang LDFLAGS="-no-pie" CFLAGS="-O3 -funroll-loops -D_HF_LINUX_NO_BFD" make
3740

3841
# libhfuzz.a will be added by CC/CXX linker directly during linking,
3942
# but it's defined here to satisfy the build infrastructure

infra/base-images/base-image/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
# Base image for all other images.
1818

19-
ARG parent_image=ubuntu:20.04@sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d
19+
# Pin to a hash to keep stable and re-usable caches
20+
ARG parent_image=ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782
2021

2122
FROM $parent_image
2223

infra/base-images/base-runner/install_deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ apt-get update && apt-get install -y \
3232
case $(uname -m) in
3333
x86_64)
3434
# We only need to worry about i386 if we are on x86_64.
35-
apt-get install -y lib32gcc1 libc6-i386
35+
apt-get install -y lib32gcc-s1 libc6-i386
3636
;;
3737
esac

0 commit comments

Comments
 (0)