diff options
author | Patrick Venture <venture@google.com> | 2019-03-30 18:03:17 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-06 01:30:08 +0300 |
commit | 47ba9da0bba65c6842873bc80d4e6a7222f845e5 (patch) | |
tree | 0ce19bec6ccdf023bc61c43c630c901adc0cef34 | |
parent | d8014ce4f8b196e0b05cf7efac542204c635702e (diff) | |
download | openbmc-47ba9da0bba65c6842873bc80d4e6a7222f845e5.tar.xz |
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
(From meta-phosphor rev: 5c05f8ab24c9ae6f655a9c5c4ccf5a60f9796491)
Change-Id: Ie79ae3e3d9f58d598e8c54697ed7b0b89e7974ad
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r-- | meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 56538a59c..c414987ea 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "efd8e9106a73c99d84dbafaf4f9348fca9abd1c0" +SRCREV = "ab8231c66364286a10b0da6d64d9742752323b4d" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index 7169caa7c..fe30f4fd5 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -53,14 +53,14 @@ RPROVIDES_${PN}-version += " \ 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://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 + 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 |