meta-openpower: occ: remove meta services and scripts
These services and script file are now in the actual
openpower-occ-control repository. Delete them from the meta layer so we
install the correct ones.
Tested:
- Confirmed expected files are now installed
Change-Id: If2b0cc868b5ca42ebf36be22da50a64d57b99274
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/occ-active.sh b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/occ-active.sh
deleted file mode 100755
index bb9e482..0000000
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/occ-active.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# set and unset occ active for all occ's in system
-
-if [ "$1" = "disable" ]; then
- value='false'
-elif [ "$1" = "enable" ]; then
- value='true'
-else
- echo "Usage: occ-active.sh [argument]"
- echo " enable - set occ's to active state"
- echo " disable - set occ's to inactive state"
- exit 1
-fi
-
-OCC_CONTROL_SERVICE="org.open_power.OCC.Control"
-
-busctl tree $OCC_CONTROL_SERVICE --list | grep -i occ | xargs -r -n1 -I{} \
- busctl set-property $OCC_CONTROL_SERVICE {} org.open_power.OCC.Status \
- OccActive b $value
-exit 0
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
deleted file mode 100644
index dfa3935..0000000
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=OpenPOWER OCC Active Disable
-Before=obmc-host-stop-pre@%i.target
-Before=op-enter-mpreboot@%i.service
-Before=op-stop-instructions@%i.service
-Conflicts=op-occ-enable@%i.service
-
-[Service]
-ExecStart=/usr/bin/occ-active.sh disable
-Type=oneshot
-
-[Install]
-WantedBy=obmc-host-stop@%i.target
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
deleted file mode 100644
index 5431101..0000000
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OpenPOWER OCC Active Enable for host %I
-Conflicts=obmc-host-stop@%i.target
-Conflicts=op-occ-disable@%i.service
-Wants=org.open_power.OCC.Control.service
-After=org.open_power.OCC.Control.service
-Wants=fsi-scan@%i.service
-After=fsi-scan@%i.service
-ConditionPathExists=/run/openbmc/host@%i-on
-
-[Service]
-ExecStart=/usr/bin/occ-active.sh enable
-Type=oneshot
-
-[Install]
-WantedBy=obmc-host-start@%i.target
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
deleted file mode 100644
index 5f9b907..0000000
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=OpenPOWER OCC controller
-Wants=mapper-wait@-xyz-openbmc_project-inventory.service
-After=mapper-wait@-xyz-openbmc_project-inventory.service
-Wants=obmc-host-reset-running@0.target
-After=obmc-host-reset-running@0.target
-Wants=xyz.openbmc_project.PLDM
-After=xyz.openbmc_project.PLDM
-
-[Service]
-ExecStart=/usr/bin/openpower-occ-control
-Restart=always
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb
index fec8136..83e7e09 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb
@@ -12,13 +12,6 @@
require ${BPN}.inc
-SRC_URI += "file://occ-active.sh"
-do_install:append() {
- install -d ${D}${bindir}
- install -m 0755 ${WORKDIR}/occ-active.sh \
- ${D}${bindir}/occ-active.sh
-}
-
DBUS_SERVICE:${PN} += "org.open_power.OCC.Control.service"
SYSTEMD_SERVICE:${PN} += "op-occ-enable@.service"
SYSTEMD_SERVICE:${PN} += "op-occ-disable@.service"