diff options
| author | Manojkiran Eda <manojkiran.eda@gmail.com> | 2022-09-27 21:59:35 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-10-12 01:05:36 +0300 |
| commit | c593475f1c75359a3dd857f5edccdf348939747a (patch) | |
| tree | 67c43021ecb821c80fbf7a3495f55f269aff2a5b | |
| parent | d1341d440bb7ac93e5644e349bf56368a6361a58 (diff) | |
| download | openbmc-c593475f1c75359a3dd857f5edccdf348939747a.tar.xz | |
Fix recipes to use libpldm instead of pldm & bump
This commit does following things :
1. It would build pldm in libpldm-only=disabled mode, so pldm recipe
would now not build & ship libpldm anymore.
2. Package libpldm into ibm systems which actually build pldm repo with
just libpldm-only option & ships the libpldm shared library.
3. Change pldm & all the dependent recipes to use libpldm instead of
pldm.
Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>
Change-Id: I6c616f6d8df00e783f94da0e69bd3127089e2184
3 files changed, 4 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 d618e14bac..b47c750fab 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -22,7 +22,7 @@ PACKAGECONFIG[jffs-workaround] = "-Djffs-workaround=enabled, \ -Djffs-workaround=disabled" PACKAGECONFIG[host-dump-transport-pldm] = " \ -Dhost-transport=pldm,, \ - pldm \ + libpldm \ " PACKAGECONFIG[openpower-dumps-extension] = " \ -Dopenpower-dumps-extension=enabled, \ diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 8044cb3dcc..81dc0a63b8 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -20,7 +20,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[openpower-pels] = " \ -Dopenpower-pel-extension=enabled, \ -Dopenpower-pel-extension=disabled, \ - nlohmann-json cli11 pldm python3, \ + nlohmann-json cli11 libpldm python3, \ python3, \ " PV = "1.0+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index bf67245bca..8d375a1f7c 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -6,6 +6,7 @@ DEPENDS += "sdeventplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "nlohmann-json" DEPENDS += "cli11" +DEPENDS += "libpldm" PV = "1.0+git${SRCPV}" PR = "r1" @@ -19,6 +20,7 @@ inherit systemd EXTRA_OEMESON = " \ -Dtests=disabled \ -Doem-ibm=disabled \ + -Dlibpldm-only=disabled \ " pkg_prerm:${PN} () { |