summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-phosphor/flash
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2019-10-25 21:02:36 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-11-06 02:57:37 +0300
commitd284df96b9d1ce873bd8a2693026c2e0de5f1b80 (patch)
tree8f40f640129d8025247fb0f67c226c4f1fe62308 /meta-phosphor/recipes-phosphor/flash
parentccfa5aba3f849af952a6dae1dbc2d6d41aa56d82 (diff)
downloadopenbmc-d284df96b9d1ce873bd8a2693026c2e0de5f1b80.tar.xz
phosphor-software-manager: Add usr-local.mount to common code
The usr-local.mount service file does not depend on a ubi filesystem layout, so move it out to the common code. (From meta-phosphor rev: 02b6df9343687286836f87f2478eea3cc50d7af3) Change-Id: I398ebff667b8bee496debc933f2865e6cc1f03e5 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/flash')
-rw-r--r--meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc2
-rw-r--r--meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb6
2 files changed, 7 insertions, 1 deletions
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
index 7e0c68f7a..e72b2ef3d 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt"
-SRCREV = "f6144e9e2aba399246f1dba8544844f518968c07"
+SRCREV = "22848eceb4f19c93b1e3331e52005ce09523637d"
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
index 588c55f32..bdd95df82 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -58,6 +58,7 @@ FILES_${PN}-download-mgr += "${bindir}/phosphor-download-manager"
FILES_${PN}-updater += " \
${bindir}/phosphor-image-updater \
${bindir}/obmc-flash-bmc \
+ /usr/local \
"
FILES_${PN}-sync += " \
${bindir}/phosphor-sync-software-manager \
@@ -70,6 +71,11 @@ DBUS_SERVICE_${PN}-sync += "xyz.openbmc_project.Software.Sync.service"
SYSTEMD_SERVICE_${PN}-updater += " \
obmc-flash-bmc-setenv@.service \
+ usr-local.mount \
"
S = "${WORKDIR}/git"
+
+do_install_append() {
+ install -d ${D}/usr/local
+}