diff options
author | Lei YU <mine260309@gmail.com> | 2018-08-21 11:18:28 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-28 17:58:17 +0300 |
commit | a974b4759eca1f5f956c0e0b3ff8bbf30e120155 (patch) | |
tree | b7844042345ca5456f3539002e33ca48bfe2159c | |
parent | bc3a2306ef5a4f4ea77a204161da34fc5373c0fc (diff) | |
download | openbmc-a974b4759eca1f5f956c0e0b3ff8bbf30e120155.tar.xz |
phosphor-software-manager: Add MEDIA_DIR config
Configure MEDIA_DIR to /run/media for static flash layout;
Configure MEDIA_DIR to /media which is default for ubi-fs.
Resolves openbmc/phosphor-bmc-code-mgmt#3
Tested: Verify that the MEDIA_DIR is set to /run/media for Romulus
build, and set to /media for Witherspoon build.
(From meta-phosphor rev: f43eb6ee89433e4898cbdb1532963f038419c003)
Change-Id: If96c2ee135d314bd6de0cd745c6a871b75183fe1
Signed-off-by: Lei YU <mine260309@gmail.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r-- | meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 10 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index 466d3ceb6..42e08ce17 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -10,6 +10,16 @@ FILES_${PN}-updater-ubi += " \ /usr/local \ " +# Remove default configs +EXTRA_OECONF_remove_df-obmc-ubi-fs += " \ + MEDIA_DIR=/run/media \ +" + +# Add ubi-fs configs +EXTRA_OECONF_append_df-obmc-ubi-fs += " \ + MEDIA_DIR=/media \ +" + SYSTEMD_SERVICE_phosphor-software-manager-updater-ubi += " \ obmc-flash-bmc-ubirw.service \ obmc-flash-bmc-ubiro@.service \ diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb index f9498011c..eb2468d92 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb @@ -56,6 +56,9 @@ RDEPENDS_${PN}-updater += " \ sdbusplus \ virtual-obmc-image-manager \ " +EXTRA_OECONF += " \ + MEDIA_DIR=/run/media \ +" RPROVIDES_${PN}-version += " \ virtual-obmc-image-manager \ |