meta-facebook: tiogapass: powerctrl

The setup_gpio.sh, power service, and power-util are not applicable to
all platforms.  They will be moved to the tiogapass platform layer.
The setup_gpio.sh uses exported GPIO, which can impact the libgpio
function.

Change-Id: I7a95f8a5466f220d3c5fb8aadb2507d0f23ce857
Signed-off-by: Peter Yin <peter.yin@quantatw.com>

10 files changed, 33 insertions, 27 deletions

diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/images/fb-tiogapass-phosphor-image.inc b/meta-facebook/meta-tiogapass/recipes-phosphor/images/fb-tiogapass-phosphor-image.inc
new file mode 100644
index 0000000000..b8a2845f75
--- /dev/null
+++ b/meta-facebook/meta-tiogapass/recipes-phosphor/images/fb-tiogapass-phosphor-image.inc
@@ -0,0 +1,5 @@
+# Tiogapass Image configuration.
+
+OBMC_IMAGE_EXTRA_INSTALL:append = " \
+    fb-powerctrl \
+"
diff --git a/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb
new file mode 100644
index 0000000000..21bd220432
--- /dev/null
+++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb
@@ -0,0 +1,28 @@
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+inherit allarch systemd obmc-phosphor-systemd
+
+RDEPENDS:${PN} += "bash"
+
+SRC_URI += " \
+    file://setup_gpio.sh \
+    file://power-util \
+    file://host-gpio.service \
+    file://host-poweroff.service \
+    file://host-poweron.service \
+    "
+
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE:${PN}:append = " \
+    host-gpio.service host-poweron.service \
+    host-poweroff.service \
+    "
+
+S = "${WORKDIR}"
+
+do_install() {
+    install -d ${D}/usr/sbin
+    install -m 0755 ${S}/setup_gpio.sh ${D}/${sbindir}/
+    install -m 0755 ${S}/power-util ${D}/${sbindir}/
+}
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/LICENSE b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/LICENSE
index 2caf820991..2caf820991 100644
--- a/meta-facebook/recipes-fb/fb-powerctrl/files/LICENSE
+++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/LICENSE
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/host-gpio.service b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-gpio.service
index 82ba12e8ec..82ba12e8ec 100644
--- a/meta-facebook/recipes-fb/fb-powerctrl/files/host-gpio.service
+++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-gpio.service
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/host-poweroff.service b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-poweroff.service
index d23ef909c7..d23ef909c7 100644
--- a/meta-facebook/recipes-fb/fb-powerctrl/files/host-poweroff.service
+++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-poweroff.service
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/host-poweron.service b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-poweron.service
index 446df38503..446df38503 100644
--- a/meta-facebook/recipes-fb/fb-powerctrl/files/host-poweron.service
+++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-poweron.service
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/power-util b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/power-util
index d00dfde7fd..d00dfde7fd 100755
--- a/meta-facebook/recipes-fb/fb-powerctrl/files/power-util
+++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/power-util
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/setup_gpio.sh
index cac3b20c7d..cac3b20c7d 100755
--- a/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh
+++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/setup_gpio.sh
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb
deleted file mode 100644
index ee72021640..0000000000
--- a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-FILESEXTRAPATHS:append := "${THISDIR}/files:"
-
-inherit obmc-phosphor-systemd
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a8328fd2a610bf4527feedcaa3ae3d14"
-
-S = "${WORKDIR}"
-
-SRC_URI = "file://setup_gpio.sh \
-           file://power-util \
-           file://host-gpio.service \
-           file://host-poweroff.service \
-           file://host-poweron.service \
-           file://LICENSE"
-
-DEPENDS = "systemd"
-RDEPENDS:${PN} = "bash"
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE:${PN} = "host-gpio.service host-poweron.service host-poweroff.service"
-
-do_install() {
-    install -d ${D}/usr/sbin
-    install -m 0755 ${S}/setup_gpio.sh ${D}/${sbindir}/
-    install -m 0755 ${S}/power-util ${D}/${sbindir}/
-}
diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb
index 4413abba5a..3cbd037b73 100644
--- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb
+++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb
@@ -45,7 +45,6 @@ RDEPENDS:${PN}-flash = " \
 
 RDEPENDS_PN_SYSTEM_EXTRAS = ""
 RDEPENDS_PN_SYSTEM_EXTRAS:fb-withhost = " \
-        fb-powerctrl \
         phosphor-ipmi-ipmb \
         fb-ipmi-oem \
         phosphor-hostlogger \