summaryrefslogtreecommitdiff
path: root/meta-phosphor
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2020-03-25 08:53:32 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-03-25 15:51:56 +0300
commit81e9ee0bf0a3cf373ed354fb1687b5ddebc6150c (patch)
tree282143b54167b81f0024aed0aebceb25f1709b40 /meta-phosphor
parentec13b7f29454275cbd291023b90574e06450b8a4 (diff)
downloadopenbmc-81e9ee0bf0a3cf373ed354fb1687b5ddebc6150c.tar.xz
phosphor-debug-collector: Fix build when pldm enabled
The PACKAGECONFIG directive for pldm offload was missing a comma, meaning the dependency was being interpreted as the 'disable-feature' flag. Add a comma to indicate an empty 'disable-feature' option for PACKAGECONFIG[host-dump-offload-pldm]. This also bumps the pldm repository by one commit to include a build fix. Dhruvaraj Subhashchandran (1): Add pdr.h to headers in meson.build. (From meta-phosphor rev: 765da5bf2e8b60cd08dbc5faabfaff264d6755a4) Change-Id: I97895199d7fdc457b1557d75c82b485c1bb68924 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb2
-rw-r--r--meta-phosphor/recipes-phosphor/pldm/pldm.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb
index 7a4d17050..8e455b54d 100644
--- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb
+++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb
@@ -184,7 +184,7 @@ PACKAGECONFIG[ubifs-workaround] = " \
"
PACKAGECONFIG[host-dump-offload-pldm] = " \
- --with-host-dump-offload-transport=pldm, \
+ --with-host-dump-offload-transport=pldm,, \
pldm \
"
diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc
index 65ee87ede..4b5ad8f9f 100644
--- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc
+++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
SRC_URI = "git://github.com/openbmc/pldm"
-SRCREV = "f3295be12d9cba0186267860aa738679fed67017"
+SRCREV = "442210e450bcd9bced09988ac2d237416193a89d"