commit bc3a2306ef5a4f4ea77a204161da34fc5373c0fc
author Lei YU <mine260309@gmail.com> Mon Jul 23 13:26:15 2018 +0800
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Aug 28 10:58:14 2018 -0400
tree e63b2f1c381aae5e2e760e8bb32d97533924cce8
parent 627b36608ec20f3cc28b1a2aad0af64d4ba15fee

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>

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 f11fcd0..466d3ce 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 += "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

meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb

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 5527706..f949801 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 @@
     sdbusplus \
 "
 RDEPENDS_${PN}-updater += " \
+    bash \
     phosphor-logging \
     phosphor-dbus-interfaces \
     sdbusplus \
@@ -62,7 +63,10 @@
 
 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}-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.