obmcutil: Add 'sh' version, remove python version

obmcutil was moved from skeleton to state-manager
and converted to 'sh'.

obmcutil-completion.sh no longer needed in pydevtools.

Add recipe for new repo `phosphor-power-control`
to install chassiskill.

Adds the phosphor-power-control apps to the
chassis-state-mgmt packagegroup.

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

phosphor-state-manager: srcrev bump 32c532ea9b..19096267d4

Alexander Filippov (1):
      obmcutil: add more info to state subcommand

Anthony Wilson (2):
      obmcutil: Add to 'make install' list
      obmcutil: Add chassiskill option

Patrick Venture (2):
      build: pkg anti-pattern: use defaults
      build: install into bin instead of sbin

(From meta-phosphor rev: 3492fb98c0a181a1c2adaae9682ef66683407241)

Change-Id: Id0afaa80d1fa0c309d3d6d3483c40d26351f5f06
Signed-off-by: Anthony Wilson <wilsonan@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

4 files changed, 27 insertions, 15 deletions

diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb
new file mode 100644
index 000000000..b9f7dc977
--- /dev/null
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Chassis Power Control"
+HOMEPAGE = "https://github.com/openbmc/phosphor-power-control"
+PR = "r1"
+PV = "1.0+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+inherit autotools pkgconfig
+
+DEPENDS += "autoconf-archive-native"
+DEPENDS += "phosphor-logging"
+DEPENDS += "nlohmann-json"
+DEPENDS += "gpioplus"
+
+S = "${WORKDIR}/git"
+
+SRC_URI = "git://github.com/openbmc/phosphor-power-control"
+SRCREV = "4d209a24588d112dfd61158b2e01dd973d99961e"
diff --git a/meta-phosphor/recipes-phosphor/devtools/obmc-pydevtools_git.bb b/meta-phosphor/recipes-phosphor/devtools/obmc-pydevtools_git.bb
index ea0264cb3..96eee6fc8 100644
--- a/meta-phosphor/recipes-phosphor/devtools/obmc-pydevtools_git.bb
+++ b/meta-phosphor/recipes-phosphor/devtools/obmc-pydevtools_git.bb
@@ -16,11 +16,3 @@ RDEPENDS_${PN} += "\
 	"
 
 SKELETON_DIR = "pytools"
-
-do_install_append() {
-	if [ -f ${S}/obmcutil-completion.sh ]
-	then
-		install -d ${D}${sysconfdir}/profile.d
-		install -m 0644 -D -t ${D}${sysconfdir}/profile.d ${S}/obmcutil-completion.sh
-	fi
-}
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index a997b2d6a..5f0e9850f 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -33,6 +33,7 @@ RDEPENDS_${PN}-bmc-state-mgmt = " \
 SUMMARY_${PN}-chassis-state-mgmt = "Chassis state management"
 RDEPENDS_${PN}-chassis-state-mgmt = " \
         ${VIRTUAL-RUNTIME_obmc-chassis-state-manager} \
+        obmc-phosphor-power \
         "
 
 SUMMARY_${PN}-extras = "Extra features"
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
index 59c743a69..972738dee 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -41,25 +41,26 @@ DEPENDS += "sdbusplus"
 DEPENDS += "sdeventplus"
 DEPENDS += "phosphor-logging"
 DEPENDS += "phosphor-dbus-interfaces"
-DEPENDS += "systemd"
 DEPENDS += "libcereal"
 
-FILES_${PN}-host = "${sbindir}/phosphor-host-state-manager"
+FILES_${PN}-host = "${bindir}/phosphor-host-state-manager"
 DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service"
 DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service"
 SYSTEMD_ENVIRONMENT_FILE_${PN}-host += "obmc/phosphor-reboot-host/reboot.conf"
 SYSTEMD_SERVICE_${PN}-host += "phosphor-reset-host-reboot-attempts@.service"
 
-FILES_${PN}-chassis = "${sbindir}/phosphor-chassis-state-manager"
+FILES_${PN}-chassis = "${bindir}/phosphor-chassis-state-manager"
 DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service"
 
-FILES_${PN}-bmc = "${sbindir}/phosphor-bmc-state-manager"
+FILES_${PN}-chassis += "${bindir}/obmcutil"
+
+FILES_${PN}-bmc = "${bindir}/phosphor-bmc-state-manager"
 DBUS_SERVICE_${PN}-bmc += "xyz.openbmc_project.State.BMC.service"
 
-FILES_${PN}-discover = "${sbindir}/phosphor-discover-system-state"
+FILES_${PN}-discover = "${bindir}/phosphor-discover-system-state"
 SYSTEMD_SERVICE_${PN}-discover += "phosphor-discover-system-state@.service"
 
-FILES_${PN}-host-check = "${sbindir}/phosphor-host-check"
+FILES_${PN}-host-check = "${bindir}/phosphor-host-check"
 SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-check@.service"
 SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-running@.service"
 
@@ -131,6 +132,6 @@ HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TG
 SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}"
 
 SRC_URI += "git://github.com/openbmc/phosphor-state-manager"
-SRCREV = "32c532ea9bcddcab30f4fff30e6938211fdf584d"
+SRCREV = "19096267d41544379b403dff1283f0cb925990f1"
 
 S = "${WORKDIR}/git"