Skip to content

Commit f79ce4c

Browse files
build-unit-test-docker: phosphor-logging: switch to meson
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I5d09f61a0151abd71609746fda92607369949484
1 parent 7339515 commit f79ce4c

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

scripts/build-unit-test-docker

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,9 @@ packages = {
222222
"openbmc/sdbusplus",
223223
"openbmc/sdeventplus",
224224
],
225-
build_type="autoconf",
225+
build_type="meson",
226226
config_flags=[
227-
"--enable-metadata-processing",
228-
f"YAML_DIR={prefix}/share/phosphor-dbus-yaml/yaml",
227+
f"-Dyaml_dir={prefix}/share/phosphor-dbus-yaml/yaml",
229228
],
230229
),
231230
"openbmc/phosphor-objmgr": PackageDef(
@@ -721,7 +720,7 @@ RUN echo "ubuntu keyserver rev as of 2021-04-21"
721720
# New releases have a package, older ones fall back to manual fetching
722721
# https://wiki.ubuntu.com/Debug%20Symbol%20Packages
723722
RUN apt-get update && apt-get dist-upgrade -yy && \
724-
( apt-get install ubuntu-dbgsym-keyring || \
723+
( apt-get install gpgv ubuntu-dbgsym-keyring || \
725724
( apt-get install -yy dirmngr && \
726725
apt-key adv --keyserver keyserver.ubuntu.com \
727726
--recv-keys F2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622 ) )

0 commit comments

Comments
 (0)