commit 5c05f8ab24c9ae6f655a9c5c4ccf5a60f9796491
author Patrick Venture <venture@google.com> Sat Mar 30 08:03:17 2019 -0700
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Fri Apr 05 22:27:43 2019 +0000
tree 2f64e8a802da13f5d0d4e16d675c70f1db7360d9
parent 7c9d6f940ed6fca0dffc9835c261bc3da3a4f4ba

meta-phosphor: software-manager: install into bin

Install the components associated with the phosphor-software-manager
package into bin.

phosphor-bmc-code-mgmt: srcrev bump efd8e9106a..ab8231c663
Patrick Venture (1):
      build: install into bin instead of sbin

Change-Id: I5e4f1834b00a3ebacc2634c13b17bca58130e5de
Signed-off-by: Patrick Venture <venture@google.com>

recipes-phosphor/flash/phosphor-software-manager_git.bb

diff --git a/recipes-phosphor/flash/phosphor-software-manager_git.bb b/recipes-phosphor/flash/phosphor-software-manager_git.bb
index 7169caa..fe30f4f 100644
--- a/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -53,14 +53,14 @@
     virtual-obmc-image-manager \
 "
 
-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}-version += "${bindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf"
+FILES_${PN}-download-mgr += "${bindir}/phosphor-download-manager"
 FILES_${PN}-updater += " \
-    ${sbindir}/phosphor-image-updater \
-    ${sbindir}/obmc-flash-bmc \
+    ${bindir}/phosphor-image-updater \
+    ${bindir}/obmc-flash-bmc \
     "
 FILES_${PN}-sync += " \
-    ${sbindir}/phosphor-sync-software-manager \
+    ${bindir}/phosphor-sync-software-manager \
     ${sysconfdir}/synclist \
     "
 DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.Version.service"
@@ -76,8 +76,8 @@
 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
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/obmc-flash-bmc ${D}${bindir}/obmc-flash-bmc
 
     # /tmp/images is the software image upload directory.
     # It should not be deleted since it is watched by the Image Manager