commit f43eb6ee89433e4898cbdb1532963f038419c003
author Lei YU <mine260309@gmail.com> Tue Aug 21 16:18:28 2018 +0800
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Aug 28 13:35:57 2018 +0000
tree 27a8a3d4a29a682c839c8821f5137067d484fcc6
parent b2c944f13b0f891a7f569f3a9608e3c0de27a462

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.

Change-Id: I20ff59c2f03c5f5fc4e004b0bf5d464a210a1654
Signed-off-by: Lei YU <mine260309@gmail.com>

classes/phosphor-software-manager-ubi-fs.bbclass

diff --git a/classes/phosphor-software-manager-ubi-fs.bbclass b/classes/phosphor-software-manager-ubi-fs.bbclass
index 466d3ce..42e08ce 100644
--- a/classes/phosphor-software-manager-ubi-fs.bbclass
+++ b/classes/phosphor-software-manager-ubi-fs.bbclass
@@ -10,6 +10,16 @@
     /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 \

common/recipes-phosphor/flash/phosphor-software-manager.bb

diff --git a/common/recipes-phosphor/flash/phosphor-software-manager.bb b/common/recipes-phosphor/flash/phosphor-software-manager.bb
index f949801..eb2468d 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -56,6 +56,9 @@
     sdbusplus \
     virtual-obmc-image-manager \
 "
+EXTRA_OECONF += " \
+    MEDIA_DIR=/run/media \
+"
 
 RPROVIDES_${PN}-version += " \
     virtual-obmc-image-manager \