diff options
| author | Lei YU <mine260309@gmail.com> | 2018-07-23 13:26:15 +0800 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-28 10:58:14 -0400 |
| commit | bc3a2306ef5a4f4ea77a204161da34fc5373c0fc (patch) | |
| tree | e63b2f1c381aae5e2e760e8bb32d97533924cce8 /meta-phosphor/classes | |
| parent | 627b36608ec20f3cc28b1a2aad0af64d4ba15fee (diff) | |
| download | talos-openbmc-bc3a2306ef5a4f4ea77a204161da34fc5373c0fc.tar.gz talos-openbmc-bc3a2306ef5a4f4ea77a204161da34fc5373c0fc.zip | |
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/classes')
| -rw-r--r-- | meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 6 |
1 files changed, 0 insertions, 6 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 |
