[servod] Use meson to build flashrom instead of GNU make
BUG=b:210733123
TEST=Build manually
Change-Id: I5d7eb925123df5854c83fbb5810b89a2ace820d8
diff --git a/src/dockerfiles/servod/Dockerfile b/src/dockerfiles/servod/Dockerfile
index 1b043ed..f6572d9 100644
--- a/src/dockerfiles/servod/Dockerfile
+++ b/src/dockerfiles/servod/Dockerfile
@@ -129,7 +129,7 @@
WORKDIR /
RUN git clone https://chromium.googlesource.com/chromiumos/third_party/flashrom
WORKDIR /flashrom
-RUN make && make install
+RUN meson builddir && cd builddir && meson install
# Install vboot.
WORKDIR /
diff --git a/src/dockerfiles/servod/requirements.in b/src/dockerfiles/servod/requirements.in
index a41e214..6818d71 100644
--- a/src/dockerfiles/servod/requirements.in
+++ b/src/dockerfiles/servod/requirements.in
@@ -1,4 +1,6 @@
gsutil
+meson
+ninja
numpy
pexpect
pyserial
diff --git a/src/dockerfiles/servod/requirements.txt b/src/dockerfiles/servod/requirements.txt
index 7874436..c77ecfa 100644
--- a/src/dockerfiles/servod/requirements.txt
+++ b/src/dockerfiles/servod/requirements.txt
@@ -1,5 +1,5 @@
#
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
# To update, run:
#
# pip-compile
@@ -36,17 +36,16 @@
# google-apitools
# gsutil
# oauth2client
-importlib-metadata==4.0.1
- # via
- # argcomplete
- # pluggy
- # pytest
iniconfig==1.1.1
# via pytest
+meson==0.60.3
+ # via -r requirements.in
mock==2.0.0
# via gsutil
monotonic==1.6
# via gsutil
+ninja==1.10.2.3
+ # via -r requirements.in
numpy==1.19.5
# via -r requirements.in
oauth2client==4.1.3
@@ -65,13 +64,13 @@
# via pexpect
py==1.10.0
# via pytest
-pyasn1-modules==0.2.8
- # via oauth2client
pyasn1==0.4.8
# via
# oauth2client
# pyasn1-modules
# rsa
+pyasn1-modules==0.2.8
+ # via oauth2client
pycparser==2.20
# via cffi
pyopenssl==20.0.1
@@ -108,7 +107,3 @@
# pyu2f
toml==0.10.2
# via pytest
-typing-extensions==3.10.0.0
- # via importlib-metadata
-zipp==3.4.1
- # via importlib-metadata
