build-unit-test-docker: phosphor-logging: switch to meson
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I5d09f61a0151abd71609746fda92607369949484
diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 3d903bb..7c95fe3 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -222,10 +222,9 @@
"openbmc/sdbusplus",
"openbmc/sdeventplus",
],
- build_type="autoconf",
+ build_type="meson",
config_flags=[
- "--enable-metadata-processing",
- f"YAML_DIR={prefix}/share/phosphor-dbus-yaml/yaml",
+ f"-Dyaml_dir={prefix}/share/phosphor-dbus-yaml/yaml",
],
),
"openbmc/phosphor-objmgr": PackageDef(
@@ -721,7 +720,7 @@
# New releases have a package, older ones fall back to manual fetching
# https://wiki.ubuntu.com/Debug%20Symbol%20Packages
RUN apt-get update && apt-get dist-upgrade -yy && \
- ( apt-get install ubuntu-dbgsym-keyring || \
+ ( apt-get install gpgv ubuntu-dbgsym-keyring || \
( apt-get install -yy dirmngr && \
apt-key adv --keyserver keyserver.ubuntu.com \
--recv-keys F2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622 ) )