phosphor-bmc-code-mgmt: Add USB code update option

George Liu (5):
      usb: Initialize USB Code Update
      usb: Copy image file to /tmp/images via USB
      usb: Add utility for D-Bus
      usb: Update the RequestedActivation property
      usb: Add service and rules files

Change-Id: Ic1d290120c7050b419ce146fbdc14febef7814e8
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
index b701d88..832818c 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 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt"
-SRCREV = "0890ab94539f682450c0e9ac86bcbb6c8ee067d4"
+SRCREV = "6d775e6448b57f42099ce71ebef41ed1c19c5479"
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 f51319a..da308bc 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -14,6 +14,7 @@
     ${PN}-updater-ubi \
     ${PN}-updater-mmc \
     ${PN}-sync \
+    ${PN}-usb \
 "
 PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}"
 ALLOW_EMPTY:${PN} = "1"
@@ -28,6 +29,7 @@
     -Dverify-full-signature=enabled, \
     -Dverify-full-signature=disabled"
 PACKAGECONFIG[sync_bmc_files] = "-Dsync-bmc-files=enabled, -Dsync-bmc-files=disabled"
+PACKAGECONFIG[usb_code_update] = "-Dusb-code-update=enabled, -Dusb-code-update=disabled, cli11"
 PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi"
 PACKAGECONFIG[mmc_layout] = "-Dbmc-layout=mmc"
 PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled"
@@ -67,6 +69,10 @@
     ${bindir}/phosphor-sync-software-manager \
     ${sysconfdir}/synclist \
     "
+FILES:${PN}-usb += "\
+    ${base_libdir}/udev/rules.d/70-bmc-usb.rules \
+    ${bindir}/phosphor-usb-code-update \
+    "
 DBUS_SERVICE:${PN}-version += "xyz.openbmc_project.Software.Version.service"
 DBUS_SERVICE:${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service"
 DBUS_SERVICE:${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service"
@@ -81,6 +87,7 @@
 "
 
 SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}"
+SYSTEMD_SERVICE:${PN}-usb += "${@bb.utils.contains('PACKAGECONFIG', 'usb_code_update', 'usb-code-update@.service', '', d)}"
 
 S = "${WORKDIR}/git"