From d071adf43ac87f21dde2f84287120960c723962c Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Thu, 9 Jul 2020 15:11:22 -0700 Subject: Update to internal 0.66 Signed-off-by: Jason M. Bills --- .../recipes-intel/hsbp/hsbp-manager_git.bb | 2 +- .../recipes-intel/images/intel-platforms.bb | 2 +- .../intel-pfr/intel-pfr-manager_git.bb | 22 ---------------------- .../recipes-intel/intel-pfr/pfr-manager_%.bbappend | 3 +++ .../recipes-intel/smbios/smbios-mdrv1.bb | 2 +- .../recipes-intel/smbios/smbios-mdrv2.bb | 7 ++++--- 6 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb create mode 100644 meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend (limited to 'meta-openbmc-mods/meta-common/recipes-intel') diff --git a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb index 47e2d7c46..a83a2c5f9 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb @@ -2,7 +2,7 @@ SUMMARY = "HSBP Manager" DESCRIPTION = "HSBP Manager monitors HSBPs through SMBUS" SRC_URI = "git://github.com/openbmc/s2600wf-misc.git" -SRCREV = "d86629cedb04607301eef6220688c53f0b29ea0e" +SRCREV = "b688f3f460b78643b95dd80de3100f2373793200" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/images/intel-platforms.bb b/meta-openbmc-mods/meta-common/recipes-intel/images/intel-platforms.bb index 71245ac50..086832b9e 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/images/intel-platforms.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/images/intel-platforms.bb @@ -6,7 +6,7 @@ inherit obmc-phosphor-image-dev inherit ${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'image_types_intel_pfr', '', d)} DEPENDS += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'obmc-intel-pfr-image-native', '', d)}" -DEPENDS += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'intel-pfr-manager', '', d)}" +DEPENDS += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'pfr-manager', '', d)}" FEATURE_PACKAGES_obmc-sensors = "" FEATURE_PACKAGES_obmc-debug-collector = "" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb deleted file mode 100644 index d48ffb1a5..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Intel PFR Manager Service" -DESCRIPTION = "Daemon to handle all PFR functionalities" - -PV = "1.0+git${SRCPV}" - -S = "${WORKDIR}/git/intel-pfr-manager" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "bee56d62b209088454d166d1efae4825a2b175df" - -inherit cmake systemd -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.PFR.Manager.service" - -DEPENDS += " \ - sdbusplus \ - phosphor-logging \ - boost \ - i2c-tools \ - " diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend new file mode 100644 index 000000000..e91a996b5 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend @@ -0,0 +1,3 @@ +# Enable downstream autobump +SRC_URI = "git://github.com/openbmc/pfr-manager" +SRCREV = "deab6540336c8f37f076d709d77dd41456ab1605" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb index 97866ba4e..9c0b00714 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb @@ -11,7 +11,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit cmake pkgconfig pythonnative +inherit cmake pkgconfig inherit obmc-phosphor-systemd SYSTEMD_SERVICE_${PN} += "smbios-mdrv1.service" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb index f921704f6..46f14d3ed 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb @@ -2,7 +2,7 @@ SUMMARY = "SMBIOS MDR version 2 service for Intel based platform" DESCRIPTION = "SMBIOS MDR version 2 service for Intel based platfrom" SRC_URI = "git://github.com/Intel-BMC/mdrv2.git;protocol=ssh" -SRCREV = "e1d574504a16282fe86a0ca02a821ebdcd220774" +SRCREV = "5ae0c19064f010c9981cc90f4ddb2031887de4dc" S = "${WORKDIR}/git" @@ -11,7 +11,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit cmake pkgconfig pythonnative +inherit cmake pkgconfig inherit obmc-phosphor-systemd SYSTEMD_SERVICE_${PN} += "smbios-mdrv2.service" @@ -27,4 +27,5 @@ DEPENDS += " \ phosphor-logging \ " -EXTRA_OECMAKE += "-DDIMM_DBUS=OFF" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'smbios-no-dimm', d)}" +PACKAGECONFIG[smbios-no-dimm] = "-DDIMM_DBUS=OFF, -DDIMM_DBUS=ON" -- cgit v1.2.3