Skip to content

Commit 28cf36c

Browse files
committed
fixes
Signed-off-by: Javan Lacerda <javanlacerda@google.com>
1 parent cf5a9bf commit 28cf36c

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

projects/bios-bmc-smm-error-logger/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
1818

19-
RUN apt-get update && apt-get install --reinstall -y libboost-all-dev git python3-pip python3-venv libmount-dev libcap-dev gperf vim clang-18 libc++-18-dev lsb-release wget software-properties-common gnupg systemd make pkg-config libsystemd-dev libfmt-dev cmake ninja-build
20-
19+
RUN apt-get update && apt-get install --reinstall -y patchelf libboost-all-dev git python3-pip python3-venv libmount-dev libcap-dev gperf vim clang-18 libc++-18-dev lsb-release wget software-properties-common gnupg systemd make pkg-config libsystemd-dev libfmt-dev cmake ninja-build
2120
RUN python3 -m venv /env && . /env/bin/activate && pip install meson mako inflection pyyaml jinja2 jsonschema
2221

23-
# RUN git clone https://github.com/systemd/systemd.git && cd systemd && git checkout v255 && meson build && ninja -C build && ninja -C build install
2422
ENV CC=clang-18
2523
ENV CXX=clang++-18
2624

projects/bios-bmc-smm-error-logger/build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
unset CFLAGS
1919
unset CXXFLAGS
2020
unset RUSTFLAGS
21+
22+
rm -rf $OUT/*
23+
2124
source /env/bin/activate
22-
meson setup build -Dtests=disabled -Dcpp_std=c++23 -Dread-interval-ms=10000 -Dmemory-region-size=1048576 -Dmemory-region-offset=3220176896 -Dbmc-interface-version=3 -Dqueue-region-size=16384 -Due-region-size=768 -Dmagic-number-byte1=2319403398 -Dmagic-number-byte2=1343703436 -Dmagic-number-byte3=2173375339 -Dmagic-number-byte4=3360702380 --buildtype=debug -Dfuzzing=true -Dcpp_args="-stdlib=libstdc++"
25+
meson setup build -Ddefault_library=static -Dtests=disabled -Dcpp_std=c++23 -Dread-interval-ms=10000 -Dmemory-region-size=1048576 -Dmemory-region-offset=3220176896 -Dbmc-interface-version=3 -Dqueue-region-size=16384 -Due-region-size=768 -Dmagic-number-byte1=2319403398 -Dmagic-number-byte2=1343703436 -Dmagic-number-byte3=2173375339 -Dmagic-number-byte4=3360702380 --buildtype=debug -Dfuzzing=true -Dcpp_args="-stdlib=libstdc++"
2326
ninja -C build
24-
cp build/src/bios-bmc-smm-error-logger_fuzzer $OUT/bios-bmc-smm-error-logger
27+
28+
cp build/src/bios-bmc-smm-error-logger_fuzzer $OUT

projects/bios-bmc-smm-error-logger/project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ sanitizers:
1111
- address
1212
- undefined
1313

14-
os_base_version: ubuntu-24-04
14+
base_os_version: ubuntu-24-04

0 commit comments

Comments
 (0)