diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
| commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
| tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | |
| parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
| parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
| download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz | |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass')
| -rw-r--r-- | meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index cc1ad3738..6ca1fb162 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -6,17 +6,9 @@ RDEPENDS_phosphor-software-manager-updater-ubi += " \ mtd-utils-ubifs \ " -# Remove default configs -EXTRA_OECONF_remove_df-obmc-ubi-fs += " \ - ACTIVE_BMC_MAX_ALLOWED=1 \ - MEDIA_DIR=/run/media \ -" - # Add ubi-fs configs -EXTRA_OECONF_append_df-obmc-ubi-fs += " \ - ACTIVE_BMC_MAX_ALLOWED=2 \ - MEDIA_DIR=/media \ -" +EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2" +EXTRA_OEMESON += "-Dmedia-dir='/media'" SYSTEMD_SERVICE_phosphor-software-manager-updater-ubi += " \ obmc-flash-bmc-ubirw.service \ |