diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor')
17 files changed, 56 insertions, 355 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 4e56cb963..59330e8f3 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,8 +1,6 @@ # this is here just to bump faster than upstream SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "29d83258f1268b3c41f97649518fa9bb1ffe83ed" +SRCREV = "ff58eba9e7f06b60879db38e1be6b41c6b2b9092" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -EXTRA_OECMAKE = "-DYOCTO=1" - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/datetime/phosphor-time-manager_git.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/datetime/phosphor-time-manager_git.bbappend new file mode 100644 index 000000000..18780dfdd --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/datetime/phosphor-time-manager_git.bbappend @@ -0,0 +1,2 @@ +RDEPENDS_${PN}_remove = "phosphor-settings-manager" +RDEPENDS_${PN} += " settings" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index 580fd9038..63124074a 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces.git" -SRCREV = "8aec946e2844831cfc377c0e0136de5714c08a5b" +SRCREV = "00c8527a40650650d2826d77b6e4e6d48f68f622" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index cbd8e1171..2026a13b0 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -5,6 +5,6 @@ SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service" EXTRA_OECONF = "--enable-configure-dbus=yes" SRC_URI = "git://github.com/openbmc/phosphor-pid-control.git" -SRCREV = "3660b3888af789266b6c84714b4e161a32e6ea54" +SRCREV = "298a95cbb192ecc678b1a496acc954a3b2adf450" FILES_${PN} = "${bindir}/swampd ${bindir}/setsensor" 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 3bf1aedb5..52da21230 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 @@ -29,6 +29,8 @@ if grep -q 'CPU part\s*: 0xb76' /proc/cpuinfo; then case $BOARD_ID in 12) NAME="D50TNP1SB" PRODID="0x99";; + 38) NAME="WilsonCity" + PRODID="0x91";; 40) NAME="CooperCity" PRODID="0x9d";; 42) NAME="WilsonCity" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Match-BMCWeb-crashdump-to-the-D-Bus-interface-provid.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Match-BMCWeb-crashdump-to-the-D-Bus-interface-provid.patch deleted file mode 100644 index 995b62750..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Match-BMCWeb-crashdump-to-the-D-Bus-interface-provid.patch +++ /dev/null @@ -1,331 +0,0 @@ -From 7c55dfb33e035f8a31f11fd3e047a4b674f392ac Mon Sep 17 00:00:00 2001 -From: Johnathan Mantey <johnathanx.mantey@intel.com> -Date: Tue, 10 Mar 2020 17:15:28 -0700 -Subject: [PATCH] Match BMCWeb crashdump to the D-Bus interface provided by - crashdump - -The crashdump service changed to eliminate hangs, and failures to -retrieve the crashdump data. The BMCWeb crashdump handling code has to -be aligned with the server. - -Tested: -Confirmed each of the primary functions operates as expected. -Getting the collection -Getting the entries -Forcing an on demand capture -Polling for the on demand capture to complete -Retrieving the creashdump data -Clearing all of the crashdump content - -Change-Id: Ie8fb48369a782d905b942c1f9bef11f387f6463e -Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com> ---- - redfish-core/lib/log_services.hpp | 268 +++++++++++++++++------------- - 1 file changed, 150 insertions(+), 118 deletions(-) - -diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp -index f864007..4b13897 100644 ---- a/redfish-core/lib/log_services.hpp -+++ b/redfish-core/lib/log_services.hpp -@@ -1575,109 +1575,80 @@ class CrashdumpClear : public Node - } - }; - --std::string getLogCreatedTime(const std::string &crashdump) --{ -- nlohmann::json crashdumpJson = -- nlohmann::json::parse(crashdump, nullptr, false); -- if (crashdumpJson.is_discarded()) -- { -- return std::string(); -- } -- -- nlohmann::json::const_iterator cdIt = crashdumpJson.find("crash_data"); -- if (cdIt == crashdumpJson.end()) -- { -- return std::string(); -- } -- -- nlohmann::json::const_iterator siIt = cdIt->find("METADATA"); -- if (siIt == cdIt->end()) -- { -- return std::string(); -- } -- -- nlohmann::json::const_iterator tsIt = siIt->find("timestamp"); -- if (tsIt == siIt->end()) -- { -- return std::string(); -- } -- -- const std::string *logTime = tsIt->get_ptr<const std::string *>(); -- if (logTime == nullptr) -- { -- return std::string(); -- } -- -- std::string redfishDateTime = *logTime; -- if (redfishDateTime.length() > 2) -- { -- redfishDateTime.insert(redfishDateTime.end() - 2, ':'); -- } -- -- return redfishDateTime; --} -- --std::string getLogFileName(const std::string &logTime) --{ -- // Set the crashdump file name to "crashdump_<logTime>.json" using the -- // created time without the timezone info -- std::string fileTime = logTime; -- size_t plusPos = fileTime.rfind('+'); -- if (plusPos != std::string::npos) -- { -- fileTime.erase(plusPos); -- } -- return "crashdump_" + fileTime + ".json"; --} -- - static void logCrashdumpEntry(std::shared_ptr<AsyncResp> asyncResp, - const std::string &logID, - nlohmann::json &logEntryJson) - { -- auto getStoredLogCallback = [asyncResp, logID, &logEntryJson]( -- const boost::system::error_code ec, -- const std::variant<std::string> &resp) { -- if (ec) -- { -- BMCWEB_LOG_DEBUG << "failed to get log ec: " << ec.message(); -- if (ec.value() == -- boost::system::linux_error::bad_request_descriptor) -+ auto getStoredLogCallback = -+ [asyncResp, logID, &logEntryJson]( -+ const boost::system::error_code ec, -+ const std::vector<std::pair<std::string, VariantType>> ¶ms) { -+ if (ec) - { -- messages::resourceNotFound(asyncResp->res, "LogEntry", logID); -+ BMCWEB_LOG_DEBUG << "failed to get log ec: " << ec.message(); -+ if (ec.value() == -+ boost::system::linux_error::bad_request_descriptor) -+ { -+ messages::resourceNotFound(asyncResp->res, "LogEntry", -+ logID); -+ } -+ else -+ { -+ messages::internalError(asyncResp->res); -+ } -+ return; - } -- else -+ -+ std::string timestamp{}; -+ std::string filename{}; -+ for (auto property : params) - { -- messages::internalError(asyncResp->res); -+ if (property.first == "Timestamp") -+ { -+ const std::string *value = -+ sdbusplus::message::variant_ns::get_if<std::string>( -+ &property.second); -+ if (value != nullptr) -+ { -+ timestamp = *value; -+ } -+ } -+ else if (property.first == "Filename") -+ { -+ const std::string *value = -+ sdbusplus::message::variant_ns::get_if<std::string>( -+ &property.second); -+ if (value != nullptr) -+ { -+ filename = *value; -+ } -+ } - } -- return; -- } -- const std::string *log = std::get_if<std::string>(&resp); -- if (log == nullptr) -- { -- messages::internalError(asyncResp->res); -- return; -- } -- std::string logTime = getLogCreatedTime(*log); -- std::string fileName = getLogFileName(logTime); - -- logEntryJson = { -- {"@odata.type", "#LogEntry.v1_4_0.LogEntry"}, -- {"@odata.id", -- "/redfish/v1/Systems/system/LogServices/Crashdump/Entries/" + -- logID}, -- {"Name", "CPU Crashdump"}, -- {"Id", logID}, -- {"EntryType", "Oem"}, -- {"OemRecordFormat", "Crashdump URI"}, -- {"Message", -- "/redfish/v1/Systems/system/LogServices/Crashdump/Entries/" + -- logID + "/" + fileName}, -- {"Created", std::move(logTime)}}; -- }; -+ if (filename.empty() || timestamp.empty()) -+ { -+ messages::resourceMissingAtURI(asyncResp->res, logID); -+ return; -+ } -+ -+ std::string crashdumpURI = -+ "/redfish/v1/Systems/system/LogServices/Crashdump/Entries/" + -+ logID + "/" + filename; -+ logEntryJson = {{"@odata.type", "#LogEntry.v1_4_0.LogEntry"}, -+ {"@odata.id", "/redfish/v1/Systems/system/" -+ "LogServices/Crashdump/Entries/" + -+ logID}, -+ {"Name", "CPU Crashdump"}, -+ {"Id", logID}, -+ {"EntryType", "Oem"}, -+ {"OemRecordFormat", "Crashdump URI"}, -+ {"Message", std::move(crashdumpURI)}, -+ {"Created", std::move(timestamp)}}; -+ }; - crow::connections::systemBus->async_method_call( - std::move(getStoredLogCallback), crashdumpObject, - crashdumpPath + std::string("/") + logID, -- "org.freedesktop.DBus.Properties", "Get", crashdumpInterface, "Log"); -+ "org.freedesktop.DBus.Properties", "GetAll", crashdumpInterface); - } - - class CrashdumpEntryCollection : public Node -@@ -1827,38 +1798,99 @@ class CrashdumpFile : public Node - const std::string &logID = params[0]; - const std::string &fileName = params[1]; - -- auto getStoredLogCallback = [asyncResp, logID, fileName]( -- const boost::system::error_code ec, -- const std::variant<std::string> &resp) { -- if (ec) -- { -- BMCWEB_LOG_DEBUG << "failed to get log ec: " << ec.message(); -- messages::internalError(asyncResp->res); -- return; -- } -- const std::string *log = std::get_if<std::string>(&resp); -- if (log == nullptr) -- { -- messages::internalError(asyncResp->res); -- return; -- } -+ auto getStoredLogCallback = -+ [asyncResp, logID, fileName]( -+ const boost::system::error_code ec, -+ const std::vector<std::pair<std::string, VariantType>> &resp) { -+ if (ec) -+ { -+ BMCWEB_LOG_DEBUG << "failed to get log ec: " -+ << ec.message(); -+ messages::internalError(asyncResp->res); -+ return; -+ } - -- // Verify the file name parameter is correct -- if (fileName != getLogFileName(getLogCreatedTime(*log))) -- { -- messages::resourceMissingAtURI(asyncResp->res, fileName); -- return; -- } -+ std::string dbusFilename{}; -+ std::string dbusTimestamp{}; -+ std::string dbusFilepath{}; - -- // Configure this to be a file download when accessed from a browser -- asyncResp->res.addHeader("Content-Disposition", "attachment"); -- asyncResp->res.body() = *log; -- }; -+ for (auto property : resp) -+ { -+ if (property.first == "Timestamp") -+ { -+ const std::string *value = -+ sdbusplus::message::variant_ns::get_if<std::string>( -+ &property.second); -+ if (value != nullptr) -+ { -+ dbusTimestamp = *value; -+ } -+ } -+ else if (property.first == "Filename") -+ { -+ const std::string *value = -+ sdbusplus::message::variant_ns::get_if<std::string>( -+ &property.second); -+ if (value != nullptr) -+ { -+ dbusFilename = *value; -+ } -+ } -+ else if (property.first == "Log") -+ { -+ const std::string *value = -+ sdbusplus::message::variant_ns::get_if<std::string>( -+ &property.second); -+ if (value != nullptr) -+ { -+ dbusFilepath = *value; -+ } -+ } -+ } -+ -+ if (dbusFilename.empty() || dbusTimestamp.empty() || -+ dbusFilepath.empty()) -+ { -+ messages::resourceMissingAtURI(asyncResp->res, fileName); -+ return; -+ } -+ -+ // Verify the file name parameter is correct -+ if (fileName != dbusFilename) -+ { -+ messages::resourceMissingAtURI(asyncResp->res, fileName); -+ return; -+ } -+ -+ if (!std::filesystem::exists(dbusFilepath)) -+ { -+ messages::resourceMissingAtURI(asyncResp->res, fileName); -+ return; -+ } -+ std::ifstream ifs(dbusFilepath, std::ios::in | -+ std::ios::binary | -+ std::ios::ate); -+ std::ifstream::pos_type fileSize = ifs.tellg(); -+ if (fileSize < 0) -+ { -+ messages::generalError(asyncResp->res); -+ return; -+ } -+ ifs.seekg(0, std::ios::beg); -+ -+ std::string dumpData; -+ dumpData.reserve(static_cast<unsigned int>(fileSize)); -+ ifs.read(dumpData.data(), static_cast<int>(fileSize)); -+ -+ // Configure this to be a file download when accessed from -+ // a browser -+ asyncResp->res.addHeader("Content-Disposition", "attachment"); -+ asyncResp->res.body() = dumpData.data(); -+ }; - crow::connections::systemBus->async_method_call( - std::move(getStoredLogCallback), crashdumpObject, - crashdumpPath + std::string("/") + logID, -- "org.freedesktop.DBus.Properties", "Get", crashdumpInterface, -- "Log"); -+ "org.freedesktop.DBus.Properties", "GetAll", crashdumpInterface); - } - }; - --- -2.25.1 - 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 8caee0933..2e59a7b78 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,6 @@ +# todo(james) remove nobranch SRC_URI = "git://github.com/openbmc/bmcweb.git" -SRCREV = "12c7f4388b58a974265827ab62d3981ba98ed8f2" +SRCREV = "e5aaf047b6b41b0837ef0846cf5356c9a6bcb030" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" @@ -10,7 +11,6 @@ USERADD_PARAM_${PN} = "-r -s /usr/sbin/nologin -d /home/bmcweb -m -G shadow bmcw GROUPADD_PARAM_${PN} = "web; redfish " SRC_URI += "file://0001-Firmware-update-support-for-StandBySpare.patch \ - file://0002-Match-BMCWeb-crashdump-to-the-D-Bus-interface-provid.patch \ " # Enable PFR support @@ -19,6 +19,9 @@ EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DBMCWEB_E # Enable NBD_PROXY EXTRA_OECMAKE += " -DBMCWEB_ENABLE_VM_NBDPROXY=ON" +# Disable MTLS until it passes security review +EXTRA_OECMAKE += " -DBMCWEB_ENABLE_MUTUAL_TLS_AUTHENTICATION=OFF" + # Enable Validation unsecure based on IMAGE_FEATURES EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMCWEB_ENABLE_VALIDATION_UNSECURE_FEATURE=ON', '', d)}" 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 d7cec2d76..6f27959a2 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 @@ -1,9 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PROJECT_SRC_DIR := "${THISDIR}/${PN}" -# TODO: latest is breaking sensor list, needs triage before unpin -SRC_URI = "git://github.com/openbmc/phosphor-host-ipmid;nobranch=1" -SRCREV = "e7e8b8166a1c0e352ee6e0e1daa76abbff228ed6" +# latest upstream HEAD until meta-phosphor autobumps +SRCREV = "6ba8d31525130dbb5ef5b60336993ef7b50a8f51" SRC_URI += "file://phosphor-ipmi-host.service \ file://0010-fix-get-system-GUID-ipmi-command.patch \ 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 c82736781..6ea4aa960 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 = "2555e2ec1c5bd6636eb67a1a2cdf6b8b567772c9" +SRCREV = "9979e9971e17c974f29ec9ab720f5482308c119c" USERADD_PACKAGES = "${PN}" # add a group called ipmi diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-nl/multi-node-nl/nonLegacyNode.sh b/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-nl/multi-node-nl/nonLegacyNode.sh index 2a1a5ea3b..28a6bbe2a 100755 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-nl/multi-node-nl/nonLegacyNode.sh +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-nl/multi-node-nl/nonLegacyNode.sh @@ -15,6 +15,9 @@ set_fan_speed() { $(set_fan_speed) +#Stop power control service in NL mode +systemctl stop xyz.openbmc_project.Chassis.Control.Power.service + export TERM=xterm # Autologin root user to serial console (ttyS4) on boot exec /sbin/agetty -a root -J -8 -L ttyS4 115200 $TERM diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb new file mode 100644 index 000000000..f7bec2af9 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb @@ -0,0 +1,16 @@ +SUMMARY = "libmctp_intel" +DESCRIPTION = "Implementation of MCTP(DMTF DSP0236)" + +SRC_URI = "git://github.com/Intel-BMC/libmctp.git;protocol=ssh" +SRCREV = "9f0aa081fdcc1ad5a8ca9025dbd0a559a68f4005" + +S = "${WORKDIR}/git/" + +PV = "1.0+git${SRCPV}" + +LICENSE = "Apache-2.0 | GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" + +inherit cmake + +DEPENDS += "i2c-tools" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb index 72acf3127..d9a2297ac 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb @@ -1,11 +1,11 @@ SUMMARY = "MCTP Daemon" DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)" -LICENSE = "Apache-2.0 | GPLv2" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "df5eba0d1ea5a1e07d24eca95cc9ce5d25819c69" +SRCREV = "34e98dc5e6bac78ccee86fb1ea1837b9ef1360a5" S = "${WORKDIR}/git/mctpd/" @@ -16,11 +16,17 @@ inherit cmake systemd FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" DEPENDS += " \ - libmctp \ + libmctp-intel \ systemd \ sdbusplus \ phosphor-logging \ boost \ i2c-tools \ + cli11 \ + nlohmann-json \ + gtest \ " -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.mctpd.service" +SMBUS_BINDING = "smbus" + +FILES_${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.mctpd@.service" +SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.mctpd@${SMBUS_BINDING}.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 9db4eeb56..ce6cf5998 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 @@ -3,14 +3,14 @@ DESCRIPTION = "Daemon allows to configure RestrictionMode property" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/prov-mode-mgr" +S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/provisioning-mode-manager.git;protocol=ssh" -SRCREV = "bee56d62b209088454d166d1efae4825a2b175df" +SRCREV = "8994b09bfe2eae4e3d18f3a4633e965bd945547f" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.RestrictionMode.Manager.service" 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 d48a66d65..f8ca43c3c 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,4 +1,4 @@ -SRCREV = "6b1247a16d52be853c18015e7163d60abce5c00a" +SRCREV = "17aba776373e14851a04e6b9ac518622b117b2a1" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" DEPENDS_append = " libgpiod libmctp" 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 2690169ff..6f6bb860d 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 @@ -3,13 +3,14 @@ DESCRIPTION = "Daemon exposes the manufacturing mode property" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/special-mode-mgr" +S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "bee56d62b209088454d166d1efae4825a2b175df" +SRC_URI = "git://github.com/Intel-BMC/special-mode-manager.git;protocol=ssh" +SRCREV = "cf2ba04cf68d76047211f66d9bb4ae1be1907323" + 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/virtual-media/virtual-media.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb index 833de721b..5b74dec5e 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 @@ -13,7 +13,9 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.VirtualMedia.service" DEPENDS = "udev boost nlohmann-json systemd sdbusplus" -RDEPENDS_${PN} = "nbdkit" + +# Temporarily not needed due to Legacy mode disabling +# RDEPENDS_${PN} = "nbdkit" inherit cmake systemd 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 0f1d36641..5923eb8d9 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,4 +1,4 @@ SRC_URI = "git://github.com/Intel-BMC/phosphor-webui;protocol=ssh;branch=intel2" FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:" -SRCREV = "0ecbfca6ecffe61da127d2c0b61ec26e4414d6ec" +SRCREV = "8dea5a0000fcf9d1daada0b92811d9f1bf308a9f" |