From 28095f1ce1fd809d57d6139c17778fa0aab51336 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Tue, 29 Oct 2019 15:12:15 -0400
Subject: meta-phosphor: phosphor-gpio-monitor: srcrev bump

New features include:
  -meson support
  -autotools deprecation
  -in-repo systemd units

(From meta-phosphor rev: 485ee9af5aa1a4cede4dd9698ac6bbc4401af0f0)

Change-Id: Iae1cb424b5dbd578c50703b72d85001a816a17e4
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../phosphor-gpio-monitor/phosphor-gpio-monitor@.service    |  8 --------
 .../phosphor-gpio-monitor/phosphor-gpio-presence@.service   | 13 -------------
 .../recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb      |  5 ++---
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
 delete mode 100644 meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service

(limited to 'meta-phosphor')

diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
deleted file mode 100644
index 8d0f4cd5b..000000000
--- a/meta-phosphor/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/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
deleted file mode 100644
index a92f82c87..000000000
--- a/meta-phosphor/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}} --extra-ifaces=${{EXTRA_IFACES}}
-SyslogIdentifier=phosphor-gpio-presence
-
-[Install]
-RequiredBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
index b18f27794..f9a1a988f 100644
--- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
@@ -5,7 +5,7 @@ PR = "r1"
 PV = "1.0+git${SRCPV}"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-inherit autotools pkgconfig
+inherit meson pkgconfig
 inherit obmc-phosphor-dbus-service
 
 GPIO_PACKAGES = " \
@@ -23,7 +23,6 @@ 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"
@@ -38,5 +37,5 @@ FILES_${PN}-monitor += "${bindir}/phosphor-gpio-util"
 FILES_${PN}-presence += "${bindir}/phosphor-gpio-presence"
 
 SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor"
-SRCREV = "86d16f037350afd379d062ca17cab5d553a1c8f2"
+SRCREV = "26373abe6bf30f90f4be723993838eb8caa1bd63"
 S = "${WORKDIR}/git"
-- 
cgit v1.2.3