Enable non unit-test.py docker build
Add subproject wraps for dependencies that aren't pre-built in the CI
docker image. Trying to make things easier to build with less CI
infrastructure.
Change-Id: Ic5aff12e1bc98f6c2fed1b1fdc4ae0c46197622e
Signed-off-by: Jonathan Doman <jonathan.doman@intel.com>
diff --git a/meson.build b/meson.build
index 0e02dba..0dc6209 100644
--- a/meson.build
+++ b/meson.build
@@ -25,12 +25,13 @@
phosphor_logging_dep = dependency('phosphor-logging')
ipmid_dep = dependency('libipmid')
-channellayer_dep = cpp.find_library('channellayer', required: true)
+channellayer_dep = dependency('libchannellayer')
blob_manager_pre = declare_dependency(
dependencies: [
ipmi_blob_dep,
dependency('ipmiblob'),
+ ipmid_dep,
phosphor_logging_dep,
])
diff --git a/subprojects/ipmiblob.wrap b/subprojects/ipmiblob.wrap
new file mode 100644
index 0000000..8968d23
--- /dev/null
+++ b/subprojects/ipmiblob.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/openbmc/ipmi-blob-tool.git
+revision = HEAD
+
+[provide]
+ipmiblob = ipmiblob
diff --git a/subprojects/phosphor-host-ipmid.wrap b/subprojects/phosphor-host-ipmid.wrap
new file mode 100644
index 0000000..7293b99
--- /dev/null
+++ b/subprojects/phosphor-host-ipmid.wrap
@@ -0,0 +1,7 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-host-ipmid.git
+revision = HEAD
+
+[provide]
+libipmid = ipmid_dep
+libchannellayer = channellayer_dep