diff options
| -rw-r--r-- | meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 6 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index f11fcd012..466d3ceb6 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -3,19 +3,16 @@ PACKAGECONFIG_append = " ubifs_layout" RDEPENDS_phosphor-software-manager-updater-ubi += " \ - bash \ mtd-utils-ubifs \ " FILES_${PN}-updater-ubi += " \ - ${sbindir}/obmc-flash-bmc \ /usr/local \ " SYSTEMD_SERVICE_phosphor-software-manager-updater-ubi += " \ obmc-flash-bmc-ubirw.service \ obmc-flash-bmc-ubiro@.service \ - obmc-flash-bmc-setenv@.service \ obmc-flash-bmc-ubirw-remove.service \ obmc-flash-bmc-ubiro-remove@.service \ obmc-flash-bmc-ubiremount.service \ @@ -37,11 +34,8 @@ SYSTEMD_SUBSTITUTIONS += "RO_MTD:${BMC_RO_MTD}:obmc-flash-bmc-ubiro@.service" SYSTEMD_SUBSTITUTIONS += "KERNEL_MTD:${BMC_KERNEL_MTD}:obmc-flash-bmc-ubiro@.service" SYSTEMD_SUBSTITUTIONS += "RW_SIZE:${BMC_RW_SIZE}:obmc-flash-bmc-ubirw.service" -SRC_URI += "file://obmc-flash-bmc" SRC_URI += "file://synclist" do_install_append() { - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/obmc-flash-bmc ${D}${sbindir}/obmc-flash-bmc install -d ${D}/usr/local if [ -f ${WORKDIR}/build/phosphor-sync-software-manager ]; then 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 55277066d..f9498011c 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. |
