diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-02-28 02:57:13 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:57 +0300 |
commit | 6c1caca70063aa707ba809a6b4695d0f0c5646f1 (patch) | |
tree | 84da2f29a60cb571686d3a4fb93f9d1f1189d989 /meta-openbmc-mods/meta-common/recipes-core/ipmi | |
parent | 9600a7403ba2848c8751280077503a3e0f2f3481 (diff) | |
download | openbmc-6c1caca70063aa707ba809a6b4695d0f0c5646f1.tar.xz |
Update to internal 2020-02-27
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-core/ipmi')
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend | 3 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb | 32 |
2 files changed, 2 insertions, 33 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend index 0cb5bd52e..eeafa0222 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend @@ -1,4 +1,5 @@ EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DINTEL_PFR_ENABLED=ON', '', d)}" EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}" +EXTRA_OECMAKE += "-DUSING_ENTITY_MANAGER_DECORATORS=OFF" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git" -SRCREV = "38b58f5866602906833f7afc864dd2729516dd7f" +SRCREV = "849c319f95bfc5b76b1731cadbf95c24093aa53c" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb deleted file mode 100644 index 939efa75f..000000000 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Intel IPMI Providers" -DESCRIPTION = "IPMI Provider Libraries" - -SRC_URI = "git://github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh" -SRCREV = "b2c6184269e3bdf601c38f716ac7ee73379af71b" - -S = "${WORKDIR}/git" -PV = "0.1+git${SRCPV}" - -DEPENDS = "boost phosphor-ipmi-host intel-ipmi-oem systemd microsoft-gsl" - -inherit cmake obmc-phosphor-ipmiprovider-symlink - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1" - -LIBRARY_NAMES += "libmtmcmds.so" -LIBRARY_NAMES += "libsmbioshandler.so" -LIBRARY_NAMES += "libzbridgecmd.so" -LIBRARY_NAMES += "libsmbiosmdrv2.so" -LIBRARY_NAMES += "libfwupdcmds.so" - -HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" -NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" - -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" - |