meta-facebook: Move phoshphor-state-manager scripts into subdirectory

Description:
Move scripts under /usr/libexec/ to /usr/libexec/phosphor-state-manager/.

Test Case:
Check file path under BMC console.

Change-Id: Ia4178b62653e90dd6e0ae567df693f03468257bb
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>

16 files changed, 23 insertions, 23 deletions

diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle
index 6ae8c12823..b765e1e405 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 POWER_OK_SLOT=$(( $1+9 ))
 slot=$(( $1-1 ))
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service
index 9c26915f97..a8a110e4d1 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service
@@ -3,7 +3,7 @@ Description=Chassis Power Cycle: %i
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/chassis-powercycle %i
+ExecStart=/usr/libexec/phosphor-state-manager/chassis-powercycle %i
 
 [Install]
 WantedBy=obmc-chassis-powercycle@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff
index 2bdf49192a..f7d6448746 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 POWER_OK_SLOT=$(( $1+9 ))
 slot=$(( $1-1 ))
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service
index b996b34943..09494c1cd9 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service
@@ -3,7 +3,7 @@ Description=power off chassis:%i
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/chassis-poweroff %i
+ExecStart=/usr/libexec/phosphor-state-manager/chassis-poweroff %i
 
 [Install]
 WantedBy=obmc-chassis-hard-poweroff@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron
index 0e8b702fb2..9fe8315862 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 POWER_OK_SLOT=$(( $1+9 ))
 slot=$(( $1-1 ))
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service
index d19d59f10f..f7067415e9 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service
@@ -3,7 +3,7 @@ Description=power on chassis:%i
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/chassis-poweron %i
+ExecStart=/usr/libexec/phosphor-state-manager/chassis-poweron %i
 
 [Install]
 WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle
index ab39bcb87b..81cb429801 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT_ID=$(( $1-1  << 2 ))
 
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service
index 57bd2a062b..f45e71f8fe 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service
@@ -3,7 +3,7 @@ Description=Host Power Cycle: %i
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/host-powercycle %i
+ExecStart=/usr/libexec/phosphor-state-manager/host-powercycle %i
 
 [Install]
 WantedBy=obmc-host-reboot@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff
index 096e08fdde..70e8474ced 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT_ID=$(( $1-1  << 2 ))
 
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service
index 69723d3364..3ead57e051 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service
@@ -3,7 +3,7 @@ Description=power off host:%i
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/host-poweroff %i
+ExecStart=/usr/libexec/phosphor-state-manager/host-poweroff %i
 
 [Install]
 WantedBy=obmc-host-shutdown@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
index 234423e46e..008ff4590b 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT_ID=$(( $1-1  << 2 ))
 # Host Power On
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service
index a90793a8eb..6f59a6bdb9 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service
@@ -3,7 +3,7 @@ Description=power on host:%i
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/host-poweron %i
+ExecStart=/usr/libexec/phosphor-state-manager/host-poweron %i
 
 [Install]
 WantedBy=obmc-host-start@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset
index f08c1317d6..e4bf1ffc91 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT_ID=$(( $1-1  << 2 ))
 
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service
index f999d127c7..0fd059ce16 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service
@@ -3,7 +3,7 @@ Description=Host Power Reset: %i
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/host-powerreset %i
+ExecStart=/usr/libexec/phosphor-state-manager/host-powerreset %i
 
 [Install]
 WantedBy=obmc-host-force-warm-reboot@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service
index 57b6bb6851..d6b2118edc 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service
@@ -3,7 +3,7 @@ Description=Sled Cycle
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/chassis-powercycle 0
+ExecStart=/usr/libexec/phosphor-state-manager/chassis-powercycle 0
 
 [Install]
 WantedBy=obmc-chassis-powercycle@0.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 8c608355d5..b0acf75a07 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -44,14 +44,14 @@ do_install:append:greatlakes() {
     install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0777 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/host-poweroff ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/host-poweron ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/host-powercycle ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/host-powerreset ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/power-cmd ${D}${libexecdir}/
+    install -m 0777 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/host-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/host-poweron ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/host-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/
     install -m 0777 ${WORKDIR}/power-ctrl-init ${D}${libexecdir}/${PN}/
 }