diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor')
21 files changed, 185 insertions, 81 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend index 60c9fdb67..ff89f2ad2 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,6 +1,6 @@ # this is here just to bump faster than upstream SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "7d807754cc9153b04b599804464edd9654d7a81e" +SRCREV = "01542d2af1b1f45335cc8813fffcd3ed07f22989" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/fru/default-fru/checkFru.sh b/meta-openbmc-mods/meta-common/recipes-phosphor/fru/default-fru/checkFru.sh index 9f22b179e..3bf1aedb5 100755 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/fru/default-fru/checkFru.sh +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/fru/default-fru/checkFru.sh @@ -2,8 +2,11 @@ # this script checks the gpio id and loads the correct baseboard fru FRUPATH="/etc/fru" +PRODIDPATH="/var/cache/private" fruFile="$FRUPATH/baseboard.fru.bin" -if [ -f $fruFile ]; then +prodIDFile="$PRODIDPATH/prodID" + +if [ -f $fruFile -a -f $prodIDFile ]; then exit 0 fi @@ -24,20 +27,29 @@ BOARD_ID=$(read_id) if grep -q 'CPU part\s*: 0xb76' /proc/cpuinfo; then # AST2500 case $BOARD_ID in - 12) NAME="D50TNP1SB";; - 40) NAME="CooperCity";; - 42) NAME="WilsonCity";; - 45) NAME="WilsonCity";; - 60) NAME="M50CYP2SB2U";; - 62) NAME="WilsonPoint";; - *) NAME="S2600WFT";; + 12) NAME="D50TNP1SB" + PRODID="0x99";; + 40) NAME="CooperCity" + PRODID="0x9d";; + 42) NAME="WilsonCity" + PRODID="0x91";; + 45) NAME="WilsonCity" + PRODID="0x91";; + 60) NAME="M50CYP2SB2U" + PRODID="0x98";; + 62) NAME="WilsonPoint" + PRODID="0x9a";; + *) NAME="S2600WFT" + PRODID="0x7b";; esac elif grep -q 'CPU part\s*: 0xc07' /proc/cpuinfo; then # AST2600 case $BOARD_ID in - 62) NAME="ArcherCity";; - *) NAME="AST2600EVB";; + 62) NAME="ArcherCity" + PRODID="0x9c";; + *) NAME="AST2600EVB" + PRODID="0x00";; esac fi @@ -46,8 +58,17 @@ if [ -z "$NAME" ]; then NAME="Unknown" fi -cd /tmp -mkdir -p $FRUPATH -mkfru $NAME -mv $NAME.fru.bin $fruFile +if [ ! -e $prodIDFile ] +then + echo $PRODID >$prodIDFile +fi + +if [ ! -f $fruFile ] +then + cd /tmp + mkdir -p $FRUPATH + mkfru $NAME + mv $NAME.fru.bin $fruFile +fi + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index 00eb38799..3c679fc51 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/bmcweb.git" -SRCREV = "97d57aaa0b95a110c71016d190f95f853051126a" +SRCREV = "123e823757a6efc08b215766124ba7321e3cca55" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Fixed-issue-in-setLan-command-for-IP-source.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Fixed-issue-in-setLan-command-for-IP-source.patch new file mode 100644 index 000000000..6f080a4f4 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Fixed-issue-in-setLan-command-for-IP-source.patch @@ -0,0 +1,62 @@ +From 12ebdc2d53a18d286e34abf0f1553ca423ca6ca5 Mon Sep 17 00:00:00 2001 +From: Rajashekar Gade Reddy <raja.sekhar.reddy.gade@linux.intel.com> +Date: Wed, 18 Dec 2019 12:01:36 +0530 +Subject: [PATCH] Fixed issue in setLan command for IP source. + +Issue: returns success completion code for multiple requests which +is not correct as per IPMI spec. + +Fix: Added proper conditional checks + +Tested: +//IP Address Source: 0x0 (unspecified) +ipmitool -I lanplus -U root -P 0penBmc -H <ip_addr> raw 0x0c 0x01 0x03 0x04 0x0 +0xCC// Invalid data field in request + +//IP Address Source: 0x1 (static address) +ipmitool -I lanplus -U root -P 0penBmc -H <ip_addr> raw 0x0c 0x01 0x03 0x04 0x1 +0x00 //Success + +//IP Address Source: 0x2 (address obtained by BMC running DHCP) +ipmitool -I lanplus -U root -P 0penBmc -H <ip_addr> raw 0x0c 0x01 0x03 0x04 0x2 +0x00 //Success + +//IP Address Source: 0x3 (address loaded by the BIOS or system software) +ipmitool -I lanplus -U root -P 0penBmc -H <ip_addr> raw 0x0c 0x01 0x03 0x04 0x3 +0xCC// Invalid data field in request + +//IP Address Source: 0x4 (address obtained by BMC running other address assignment protocol) +ipmitool -I lanplus -U root -P 0penBmc -H <ip_addr> raw 0x0c 0x01 0x03 0x04 0x4 +0xCC// Invalid data field in request + +ipmitool -I lanplus -U root -P 0penBmc -H <ip_addr> raw 0x0c 0x01 0x03 0x04 0x5 +0x80 // param not supported + +Signed-off-by: Rajashekar Gade Reddy <raja.sekhar.reddy.gade@linux.intel.com> + +%% original patch: 0002-Fixed-issue-in-setLan-command-for-IP-source.patch +--- + transporthandler.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/transporthandler.cpp b/transporthandler.cpp +index 7407396..2df3e45 100644 +--- a/transporthandler.cpp ++++ b/transporthandler.cpp +@@ -1453,9 +1453,12 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, + return responseSuccess(); + } + case IPSrc::Unspecified: +- case IPSrc::Static: + case IPSrc::BIOS: + case IPSrc::BMC: ++ { ++ return responseInvalidFieldRequest(); ++ } ++ case IPSrc::Static: + { + channelCall<setDHCPProperty>(channel, dhcpoff); + return responseSuccess(); +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0003-Fix-for-return-CC-in-setLan-command-cases.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0003-Fix-for-return-CC-in-setLan-command-cases.patch new file mode 100644 index 000000000..bab451f32 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0003-Fix-for-return-CC-in-setLan-command-cases.patch @@ -0,0 +1,69 @@ +From 8b3cb6842746d43c0cab3d32821dc5239768642f Mon Sep 17 00:00:00 2001 +From: "Joshi, Mansi" <mansi.joshi@linux.intel.com> +Date: Wed, 18 Dec 2019 15:10:25 +0530 +Subject: [PATCH] Fix for return CC in setLan command cases + +Issue: When DHCP is enabled, setting ip and setting subnet mask returns +completion code 0xff. Setting default gateway returns 0x00. + +Fix: Returns CC 0xd5 because this parameter is R/W. It is only unable +to be updated because the current state blocks it (i.e. 0xd5). + +Tested: +ipmitool raw 0x0c 0x01 0x03 0x03 0x00 0x00 0x00 0x00 //setting ip +0xd5 //Command, or request parameter, not supported in present state. + +ipmitool raw 0x0c 0x01 0x03 0x06 0xff 0xff 0xf0 0x00 //subnet mask +0xd5 //Command, or request parameter, not supported in present state. + +ipmitool raw 0x0c 0x01 0x03 0x0c 0x0a 0xfe 0xef 0x77 //default gateway +0xd5 //Command, or request parameter, not supported in present state. + +%% original patch: 0065-Fix-for-return-CC-in-setLan-command-cases.patch +--- + transporthandler.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/transporthandler.cpp b/transporthandler.cpp +index 7407396..7b9ff3d 100644 +--- a/transporthandler.cpp ++++ b/transporthandler.cpp +@@ -1423,6 +1423,11 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, + } + case LanParam::IP: + { ++ std::string dhcp = channelCall<getDHCPProperty>(channel); ++ if ((dhcp == dhcpv4) || (dhcp == dhcpv4v6)) ++ { ++ return responseCommandNotAvailable(); ++ } + in_addr ip; + std::array<uint8_t, sizeof(ip)> bytes; + if (req.unpack(bytes) != 0 || !req.fullyUnpacked()) +@@ -1477,6 +1482,11 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, + } + case LanParam::SubnetMask: + { ++ std::string dhcp = channelCall<getDHCPProperty>(channel); ++ if ((dhcp == dhcpv4) || (dhcp == dhcpv4v6)) ++ { ++ return responseCommandNotAvailable(); ++ } + in_addr netmask; + std::array<uint8_t, sizeof(netmask)> bytes; + if (req.unpack(bytes) != 0 || !req.fullyUnpacked()) +@@ -1490,6 +1500,11 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, + } + case LanParam::Gateway1: + { ++ std::string dhcp = channelCall<getDHCPProperty>(channel); ++ if ((dhcp == dhcpv4) || (dhcp == dhcpv4v6)) ++ { ++ return responseCommandNotAvailable(); ++ } + in_addr gateway; + std::array<uint8_t, sizeof(gateway)> bytes; + if (req.unpack(bytes) != 0 || !req.fullyUnpacked()) +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index c6bc80202..ba148779f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PROJECT_SRC_DIR := "${THISDIR}/${PN}" SRC_URI = "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "225dec858e52f0e8319acfe72d7b3630adcc7a0d" +SRCREV = "ebc53cb165ea26aa48f0bbf01d9bce0e4abb0b7d" SRC_URI += "file://phosphor-ipmi-host.service \ file://host-ipmid-whitelist.conf \ @@ -15,6 +15,8 @@ SRC_URI += "file://phosphor-ipmi-host.service \ file://0063-Save-the-pre-timeout-interrupt-in-dbus-property.patch \ file://0064-Update-provisioning-mode-filter-logic.patch \ file://0001-Modify-Get-Lan-Configuration-IP-Address-Source-to-us.patch \ + file://0002-Fixed-issue-in-setLan-command-for-IP-source.patch \ + file://0003-Fix-for-return-CC-in-setLan-command-cases.patch \ " EXTRA_OECONF_append = " --disable-i2c-whitelist-check" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0012-Do-not-stop-session-in-deactivate-payload.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0012-Do-not-stop-session-in-deactivate-payload.patch deleted file mode 100644 index 6430a6928..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0012-Do-not-stop-session-in-deactivate-payload.patch +++ /dev/null @@ -1,48 +0,0 @@ -From cf8c0e1bf18334fe4a8f76c1e9b34ccfdc82f6f9 Mon Sep 17 00:00:00 2001 -From: Yong Li <yong.b.li@linux.intel.com> -Date: Fri, 15 Nov 2019 18:34:04 +0800 -Subject: [PATCH] Do not stop session in deactivate payload - -IPMI spec defines that: -The Deactivate Payload command does not cause the session to be terminated; - -Also during SOL looptest, there is only one time startSession call, -but multiple stopSessions calls, -This causes the looptest will fail if there is any new sessions comes in, -needs to remove the stopSession call. - -Tested: -Start the loop test in a terminal: -ipmitool -H $BMCIP -Uroot -P 0penBmc -I lanplus sol looptest 500 200 - -Then start a new session in another terminal: -ipmitool -H $BMCIP -Uroot -P 0penBmc -I lanplus raw 6 1 - -The looptest still works - -Signed-off-by: Yong Li <yong.b.li@linux.intel.com> ---- - command/payload_cmds.cpp | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/command/payload_cmds.cpp b/command/payload_cmds.cpp -index f558781..363b843 100644 ---- a/command/payload_cmds.cpp -+++ b/command/payload_cmds.cpp -@@ -176,13 +176,6 @@ std::vector<uint8_t> deactivatePayload(const std::vector<uint8_t>& inPayload, - */ - return outPayload; - } -- -- auto check = -- std::get<session::Manager&>(singletonPool).stopSession(sessionID); -- if (!check) -- { -- response->completionCode = IPMI_CC_UNSPECIFIED_ERROR; -- } - } - catch (std::exception& e) - { --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index b488e6d8e..614133645 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -3,7 +3,7 @@ inherit useradd # TODO: This should be removed, once up-stream bump up # issue is resolved SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "0f63e01ce6bb11920d78d999267558500ca9a272" +SRCREV = "46bec0f60a201a644c1f3af4cec2f31da58a0595" USERADD_PACKAGES = "${PN}" # add a group called ipmi @@ -22,6 +22,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " file://0006-Modify-dbus-namespace-of-chassis-control-for-guid.patch \ file://0009-Add-dbus-interface-for-sol-commands.patch \ file://0011-Remove-Get-SOL-Config-Command-from-Netipmid.patch \ - file://0012-Do-not-stop-session-in-deactivate-payload.patch \ " diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb index 635f2d3a4..9f657e39b 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicat with Management Engine via IPMB" SRC_URI = "git://github.com/Intel-BMC/node-manager;protocol=ssh" -SRCREV = "13c62849bce28161fc58134c52920e0c494745f9" +SRCREV = "ddba32d5ac94cdd8db19e18215535d7fe86675e6" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb index d89b30380..12cb4ef78 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" +SRCREV = "5a03fdc6a119b65ecf320622ce2809e340749fa9" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.U_Boot.Environment.Manager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb index 0b5a8f395..146d2e523 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" +SRCREV = "5a03fdc6a119b65ecf320622ce2809e340749fa9" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.RestrictionMode.Manager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb index 6e1df2f89..8faa23f97 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fe inherit cmake systemd SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" +SRCREV = "5a03fdc6a119b65ecf320622ce2809e340749fa9" SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.SecurityManager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index de8bdccd7..e80464274 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -2,4 +2,3 @@ SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git" SRCREV = "151b7c1fc62971b7d319146e5ea129d44eadd9d7" -EXTRA_OECMAKE_intel += "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend index f0bec9feb..5511e3b0f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1,7 +1,7 @@ -SRCREV = "9f9b38d89a751e70cdf61bfb3f78c05800201f95" +SRCREV = "347dd4e7a0a4923583151e4d9eb483b65dba9e7b" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -DEPENDS_append = " libgpiod" +DEPENDS_append = " libgpiod libmctp" FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb index f8fe0682d..314e31779 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Settings" SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" +SRCREV = "5a03fdc6a119b65ecf320622ce2809e340749fa9" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb index a6f5a433e..2c4cb80a7 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" +SRCREV = "5a03fdc6a119b65ecf320622ce2809e340749fa9" EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}" inherit cmake systemd diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index 05f97d1a9..6cef4c3ea 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" +SRCREV = "5a03fdc6a119b65ecf320622ce2809e340749fa9" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "srvcfg-manager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/state/post-code-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/state/post-code-manager_git.bb index 0d612f3b3..98e0706fa 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/state/post-code-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/state/post-code-manager_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Phosphor post code manager" DESCRIPTION = "Post Code Manager" SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "3a0444002398714c3a5539c93355c74eb184b2b1" +SRCREV = "655837973feb51da3767f5f246ec198877900b0b" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb index 433bc7ca5..910bf9fae 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb @@ -7,7 +7,7 @@ inherit cmake systemd DEPENDS = "boost sdbusplus" PV = "0.1+git${SRCPV}" -SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" +SRCREV = "5a03fdc6a119b65ecf320622ce2809e340749fa9" S = "${WORKDIR}/git/callback-manager" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb index ca86bd525..007265667 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb @@ -2,7 +2,7 @@ SUMMARY = "Virtual Media Service" DESCRIPTION = "Virtual Media Service" SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" +SRCREV = "5a03fdc6a119b65ecf320622ce2809e340749fa9" S = "${WORKDIR}/git/virtual-media/" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend index e77d8fd65..bd72b27be 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend @@ -1,2 +1,2 @@ SRC_URI = "git://github.com/Intel-BMC/phosphor-webui;protocol=ssh;branch=intel2" -SRCREV = "f9935eccf5b9de75d6622b3d0a719ce0f8a425d0" +SRCREV = "376cb79388c70253cc8c2b2f8eb40e0f5833ac40" |