diff options
| author | Lei YU <mine260309@gmail.com> | 2018-07-23 08:26:15 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-28 17:58:14 +0300 |
| commit | bc3a2306ef5a4f4ea77a204161da34fc5373c0fc (patch) | |
| tree | e63b2f1c381aae5e2e760e8bb32d97533924cce8 /meta-phosphor/common/recipes-phosphor | |
| parent | 627b36608ec20f3cc28b1a2aad0af64d4ba15fee (diff) | |
| download | openbmc-bc3a2306ef5a4f4ea77a204161da34fc5373c0fc.tar.xz | |
Make obmc-flash-bmc-setenv common for static and ubi
Static flash layout will use obmc-flash-bmc-setenv service to set
factory-reset env in u-boot, so make it common for both static and ubi
flash layout.
Tested: Build the image and verify the service and the obmc-flash-bmc
script exist in both static and ubi builds.
(From meta-phosphor rev: b2c944f13b0f891a7f569f3a9608e3c0de27a462)
Change-Id: Ia067cebfe35a9d2d7d2af8b4d1bd4cb5717372ae
Signed-off-by: Lei YU <mine260309@gmail.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb | 14 |
1 files changed, 13 insertions, 1 deletions
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 55277066d9..f9498011ca 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb @@ -50,6 +50,7 @@ RDEPENDS_${PN}-download-mgr += " \ sdbusplus \ " RDEPENDS_${PN}-updater += " \ + bash \ phosphor-logging \ phosphor-dbus-interfaces \ sdbusplus \ @@ -62,7 +63,10 @@ RPROVIDES_${PN}-version += " \ FILES_${PN}-version += "${sbindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf" FILES_${PN}-download-mgr += "${sbindir}/phosphor-download-manager" -FILES_${PN}-updater += "${sbindir}/phosphor-image-updater" +FILES_${PN}-updater += " \ + ${sbindir}/phosphor-image-updater \ + ${sbindir}/obmc-flash-bmc \ + " FILES_${PN}-sync += " \ ${sbindir}/phosphor-sync-software-manager \ ${sysconfdir}/synclist \ @@ -72,9 +76,17 @@ DBUS_SERVICE_${PN}-download-mgr += "xyz.openbmc_project.Software.Download.servic DBUS_SERVICE_${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" DBUS_SERVICE_${PN}-sync += "xyz.openbmc_project.Software.Sync.service" +SYSTEMD_SERVICE_${PN}-updater += " \ + obmc-flash-bmc-setenv@.service \ +" + SRC_URI += "file://software.conf" +SRC_URI += "file://obmc-flash-bmc" do_install_append() { + install -d ${D}${sbindir} + install -m 0755 ${WORKDIR}/obmc-flash-bmc ${D}${sbindir}/obmc-flash-bmc + # /tmp/images is the software image upload directory. # It should not be deleted since it is watched by the Image Manager # for new images. |