From ff075f6ee795a590b244d70a90cc312ba1f2d83d Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Fri, 31 Aug 2018 06:25:51 -0400
Subject: meta-phosphor: Move layer content from common/

Adopt a more conventional directory hierarchy.  meta-phosphor is still
a _long_ way from suitable for hosting on yoctoproject.org but things
like this don't help.

(From meta-phosphor rev: 471cfcefa74b8c7ceb704cb670e6d915cf27c63b)

Change-Id: I3f106b2f6cdc6cec734be28a6090800546f362eb
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../recipes-phosphor/gpio/phosphor-gpio-monitor.bb | 53 ----------------------
 .../phosphor-gpio-monitor@.service                 |  8 ----
 .../phosphor-gpio-presence@.service                | 13 ------
 3 files changed, 74 deletions(-)
 delete mode 100644 meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
 delete mode 100644 meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
 delete mode 100644 meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service

(limited to 'meta-phosphor/common/recipes-phosphor/gpio')

diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
deleted file mode 100644
index b6b92fd6c..000000000
--- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY = "Phosphor GPIO monitor application"
-DESCRIPTION = "Application to monitor gpio assertions"
-HOMEPAGE = "http://github.com/openbmc/phosphor-gpio-monitor"
-PR = "r1"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-inherit autotools pkgconfig
-inherit obmc-phosphor-dbus-service
-
-GPIO_PACKAGES = " \
-        ${PN}-monitor \
-        ${PN}-presence \
-"
-
-PACKAGE_BEFORE_PN += "${GPIO_PACKAGES}"
-ALLOW_EMPTY_${PN} = "1"
-SYSTEMD_PACKAGES = "${GPIO_PACKAGES}"
-
-RPROVIDES_${PN}-monitor += "virtual/obmc-gpio-monitor"
-RPROVIDES_${PN}-presence += "virtual/obmc-gpio-presence"
-
-PROVIDES += "virtual/obmc-gpio-monitor"
-PROVIDES += "virtual/obmc-gpio-presence"
-
-DEPENDS += "autoconf-archive-native"
-DEPENDS += "sdbusplus sdbusplus-native"
-DEPENDS += "phosphor-dbus-interfaces"
-DEPENDS += "libevdev"
-DEPENDS += "phosphor-logging"
-
-RDEPENDS_${PN}-monitor += " \
-    libsystemd \
-    libevdev \
-    phosphor-logging \
-"
-RDEPENDS_${PN}-presence += " \
-    libsystemd \
-    libevdev \
-    phosphor-logging \
-    sdbusplus \
-"
-
-SYSTEMD_SERVICE_${PN}-monitor += "phosphor-gpio-monitor@.service"
-SYSTEMD_SERVICE_${PN}-presence += "phosphor-gpio-presence@.service"
-
-FILES_${PN}-monitor += "${sbindir}/phosphor-gpio-monitor"
-FILES_${PN}-monitor += "${sbindir}/phosphor-gpio-util"
-FILES_${PN}-presence += "${sbindir}/phosphor-gpio-presence"
-
-SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor"
-SRCREV = "96e01b7c110219bef0b0f68b6054454ae27dee95"
-S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
deleted file mode 100644
index 8d0f4cd5b..000000000
--- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Phosphor GPIO %I monitor
-
-[Service]
-Restart=no
-EnvironmentFile={envfiledir}/obmc/gpio/%I
-ExecStart=/usr/bin/env phosphor-gpio-monitor --path=${{DEVPATH}} --key=${{KEY}} --polarity=${{POLARITY}} --target=${{TARGET}} ${{EXTRA_ARGS}}
-SyslogIdentifier=phosphor-gpio-monitor
diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
deleted file mode 100644
index df758246f..000000000
--- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Phosphor GPIO %I Presence
-Wants=mapper-wait@-xyz-openbmc_project-inventory.service
-After=mapper-wait@-xyz-openbmc_project-inventory.service
-ConditionPathExists={envfiledir}/obmc/gpio/phosphor-power-supply-%i.conf
-
-[Service]
-EnvironmentFile={envfiledir}/obmc/gpio/phosphor-power-supply-%i.conf
-ExecStart=/usr/bin/env phosphor-gpio-presence --path=${{DEVPATH}} --inventory=${{INVENTORY}} --key=${{KEY}} --name=${{NAME}} --drivers=${{DRIVERS}}
-SyslogIdentifier=phosphor-gpio-presence
-
-[Install]
-RequiredBy={SYSTEMD_DEFAULT_TARGET}
-- 
cgit v1.2.1