commit a974b4759eca1f5f956c0e0b3ff8bbf30e120155
author Lei YU <mine260309@gmail.com> Tue Aug 21 16:18:28 2018 +0800
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Aug 28 10:58:17 2018 -0400
tree b7844042345ca5456f3539002e33ca48bfe2159c
parent bc3a2306ef5a4f4ea77a204161da34fc5373c0fc

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>

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

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