qemu: Simplify build script (#6468)

This commit is contained in:
MarcoFalke 2021-09-17 16:02:17 +02:00 committed by GitHub
parent a392b977f8
commit 9a9a3cea1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 20 deletions

View File

@ -15,16 +15,9 @@
################################################################################
FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y make autoconf automake libtool \
RUN apt-get update && apt-get install -y make autoconf automake libtool ninja-build libglib2.0-dev \
libfdt-dev libpixman-1-dev zlib1g-dev patchelf wget \
libattr1 libattr1-dev libcap-ng-dev pkg-config
# Ninja in the apt repos is too old. Get it directly from github
RUN wget https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip \
&& unzip ninja-linux.zip \
&& rm ninja-linux.zip \
&& mv ninja /usr/bin/ninja
ADD https://download.gnome.org/sources/glib/2.67/glib-2.67.6.tar.xz $SRC
RUN tar xvJf $SRC/glib-2.67.6.tar.xz
RUN git clone --depth 1 https://git.qemu.org/git/qemu.git qemu
WORKDIR qemu
COPY build.sh $SRC/

View File

@ -17,16 +17,4 @@
pip3 install meson
# Version of glib in Ubuntu Xenial is too old
pushd $SRC/glib-2.67.6
meson _build \
-Doss_fuzz=enabled \
-Dinternal_pcre=true \
--default-library=static \
-Db_lundef=false \
-Dlibmount=disabled
ninja -C _build
ninja -C _build install
popd
./scripts/oss-fuzz/build.sh