diff options
author | Evgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru> | 2022-09-21 16:21:23 +0300 |
---|---|---|
committer | Evgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru> | 2022-09-21 16:26:42 +0300 |
commit | 928274dbdc4866ce82bba1a6207c60b61c99ce94 (patch) | |
tree | 3fe47589e51b30a842822bbb6eb2a20257fce4f3 | |
parent | d54078634e0838917c9cfb3c78dceccd86046ea1 (diff) | |
download | openbmc-928274dbdc4866ce82bba1a6207c60b61c99ce94.tar.xz |
Revert "IBS: change path to fw_*env from /sbin to /usr/bin"
This reverts commit 0fb267e6c45c5f2a0a3545821345e28b90101955.
3 files changed, 4 insertions, 36 deletions
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 deleted file mode 100644 index a7628d448e..0000000000 --- a/meta-ibs/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr/0001-Change-fw_setenv-and-fw_printenv-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c4efc32e4426d93131d8e55276e2103cdcf2a5a4 Mon Sep 17 00:00:00 2001 -From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru> -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<std::string, std::string> UBootEnvMgr::readAllVariable() - { - std::unordered_map<std::string, std::string> env; -- std::vector<std::string> output = executeCmd("/sbin/fw_printenv"); -+ std::vector<std::string> output = executeCmd("/usr/bin/fw_printenv"); - for (const auto& entry : output) - { - size_t pos = entry.find("="); -@@ -105,6 +105,6 @@ std::unordered_map<std::string, std::string> 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 81af2140f1..d5c3578168 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,9 +8,7 @@ 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 \ - file://0001-Change-fw_setenv-and-fw_printenv-path.patch \ - " +SRC_URI = "git://github.com/openbmc/phosphor-u-boot-env-mgr.git;branch=master;protocol=https" 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 7205e16225..132d11d697 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 /usr /etc +RequiresMountsFor=/run /sbin /etc [Service] Type=oneshot @@ -12,5 +12,5 @@ RemainAfterExit=yes TimeoutStartSec=60 Restart=no -ExecStart=/usr/bin/fw_setenv openbmconce -ExecStart=/usr/bin/fw_setenv openbmconce +ExecStart=/sbin/fw_setenv openbmconce +ExecStart=/sbin/fw_setenv openbmconce |