diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-29 22:12:15 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-30 16:24:17 +0300 |
| commit | 28095f1ce1fd809d57d6139c17778fa0aab51336 (patch) | |
| tree | a4a937df03ddfc58da785c132cee08402257802b /meta-phosphor | |
| parent | 4a58fe25388fc56182610ff7fccf9e9ab8d32314 (diff) | |
| download | openbmc-28095f1ce1fd809d57d6139c17778fa0aab51336.tar.xz | |
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>
Diffstat (limited to 'meta-phosphor')
3 files changed, 2 insertions, 24 deletions
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" |