From 5acb10b65c2265d3c20d7152478c44a214088221 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 25 Jan 2024 12:37:25 -0600 Subject: [PATCH] ostree: Build with stable glib (#11541) Recently glib's build process changed as it integrates parts of gobject-introspection. The only reason to build glib at all is because the version in the base image is a bit too old. Rather than building glib main, use a tagged version. 2.78.4 is a very recent stable release that satisfies ostree's 2.66.0 requirement. Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=64890 --- projects/ostree/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/ostree/Dockerfile b/projects/ostree/Dockerfile index 568c9b213..4ce61c701 100644 --- a/projects/ostree/Dockerfile +++ b/projects/ostree/Dockerfile @@ -15,6 +15,7 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder +ARG glib_tag=2.78.4 RUN apt-get update && apt-get install -y \ make \ autoconf \ @@ -30,7 +31,7 @@ RUN apt-get update && apt-get install -y \ libtool \ bison RUN unset CFLAGS CXXFLAGS && pip3 install -U meson ninja -RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/glib +RUN git clone --depth 1 --branch $glib_tag https://gitlab.gnome.org/GNOME/glib RUN git clone https://github.com/ostreedev/ostree && \ cd ostree && \ git submodule update --init