From 0fb267e6c45c5f2a0a3545821345e28b90101955 Mon Sep 17 00:00:00 2001 From: "Evgeny Alekseev (IBS Group)" Date: Wed, 21 Sep 2022 13:45:41 +0300 Subject: IBS: change path to fw_*env from /sbin to /usr/bin --- ...001-Change-fw_setenv-and-fw_printenv-path.patch | 30 ++++++++++++++++++++++ .../phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb | 4 ++- .../clear-once/clear-once/clear-once.service | 6 ++--- 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 meta-ibs/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr/0001-Change-fw_setenv-and-fw_printenv-path.patch diff --git a/meta-ibs/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr/0001-Change-fw_setenv-and-fw_printenv-path.patch b/meta-ibs/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr/0001-Change-fw_setenv-and-fw_printenv-path.patch new file mode 100644 index 0000000000..a7628d448e --- /dev/null +++ b/meta-ibs/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr/0001-Change-fw_setenv-and-fw_printenv-path.patch @@ -0,0 +1,30 @@ +From c4efc32e4426d93131d8e55276e2103cdcf2a5a4 Mon Sep 17 00:00:00 2001 +From: "Evgeny Alekseev (IBS Group)" +Date: Wed, 21 Sep 2022 13:14:17 +0300 +Subject: [PATCH] Change fw_setenv and fw_printenv path + +--- + src/u-boot-env-mgr.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/u-boot-env-mgr.cpp b/src/u-boot-env-mgr.cpp +index 30c8656..790ee77 100644 +--- a/src/u-boot-env-mgr.cpp ++++ b/src/u-boot-env-mgr.cpp +@@ -83,7 +83,7 @@ UBootEnvMgr::UBootEnvMgr(boost::asio::io_service& io_, + std::unordered_map UBootEnvMgr::readAllVariable() + { + std::unordered_map env; +- std::vector output = executeCmd("/sbin/fw_printenv"); ++ std::vector output = executeCmd("/usr/bin/fw_printenv"); + for (const auto& entry : output) + { + size_t pos = entry.find("="); +@@ -105,6 +105,6 @@ std::unordered_map UBootEnvMgr::readAllVariable() + void UBootEnvMgr::writeVariable(const std::string& key, + const std::string& value) + { +- executeCmd("/sbin/fw_setenv", key.c_str(), value.c_str()); ++ executeCmd("/usr/bin/fw_setenv", key.c_str(), value.c_str()); + return; + } diff --git a/meta-ibs/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb b/meta-ibs/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb index d5c3578168..81af2140f1 100644 --- a/meta-ibs/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb +++ b/meta-ibs/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb @@ -8,7 +8,9 @@ S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/openbmc/phosphor-u-boot-env-mgr.git;branch=master;protocol=https" +SRC_URI = "git://github.com/openbmc/phosphor-u-boot-env-mgr.git;branch=master;protocol=https \ + file://0001-Change-fw_setenv-and-fw_printenv-path.patch \ + " SRCREV = "1979d3b31a96e9359402ac4d7867ec5dddbece7e" diff --git a/meta-phosphor/recipes-phosphor/clear-once/clear-once/clear-once.service b/meta-phosphor/recipes-phosphor/clear-once/clear-once/clear-once.service index 132d11d697..7205e16225 100644 --- a/meta-phosphor/recipes-phosphor/clear-once/clear-once/clear-once.service +++ b/meta-phosphor/recipes-phosphor/clear-once/clear-once/clear-once.service @@ -2,7 +2,7 @@ Description=Clear one time boot overrides ConditionFileNotEmpty=/etc/fw_env.config -RequiresMountsFor=/run /sbin /etc +RequiresMountsFor=/run /usr /etc [Service] Type=oneshot @@ -12,5 +12,5 @@ RemainAfterExit=yes TimeoutStartSec=60 Restart=no -ExecStart=/sbin/fw_setenv openbmconce -ExecStart=/sbin/fw_setenv openbmconce +ExecStart=/usr/bin/fw_setenv openbmconce +ExecStart=/usr/bin/fw_setenv openbmconce -- cgit v1.2.3