1 files changed, 23 insertions, 24 deletions
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 6ea8c4072d..4692bd1e2e 100644
--- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
@@ -1,28 +1,8 @@
 SUMMARY = "Phosphor GPIO monitor application"
 DESCRIPTION = "Application to monitor gpio assertions"
 HOMEPAGE = "http://github.com/openbmc/phosphor-gpio-monitor"
-PR = "r1"
-PV = "1.0+git${SRCPV}"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-inherit meson 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 += "sdbusplus"
 DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "libevdev"
@@ -32,10 +12,27 @@ DEPENDS += "boost"
 DEPENDS += "libgpiod"
 DEPENDS += "cli11"
 DEPENDS += "nlohmann-json"
+PROVIDES += "virtual/obmc-gpio-monitor"
+PROVIDES += "virtual/obmc-gpio-presence"
+SRCREV = "629f3e3cd414294ee73bb3946e336f485fe8b504"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor;branch=master;protocol=https"
 
+SYSTEMD_PACKAGES = "${GPIO_PACKAGES}"
 SYSTEMD_SERVICE:${PN}-monitor += "phosphor-multi-gpio-monitor.service"
 SYSTEMD_SERVICE:${PN}-monitor += "phosphor-gpio-monitor@.service"
 SYSTEMD_SERVICE:${PN}-presence += "phosphor-gpio-presence@.service"
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig
+inherit obmc-phosphor-dbus-service
+
+EXTRA_OEMESON:append = " -Dtests=disabled"
+
+RPROVIDES:${PN}-monitor += "virtual/obmc-gpio-monitor"
+RPROVIDES:${PN}-presence += "virtual/obmc-gpio-presence"
 
 FILES:${PN}-monitor += "${bindir}/phosphor-gpio-monitor"
 FILES:${PN}-monitor += "${bindir}/phosphor-multi-gpio-monitor"
@@ -43,8 +40,10 @@ FILES:${PN}-monitor += "${bindir}/phosphor-gpio-util"
 FILES:${PN}-monitor += "${nonarch_base_libdir}/udev/rules.d/99-gpio-keys.rules"
 FILES:${PN}-presence += "${bindir}/phosphor-gpio-presence"
 
-SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor;branch=master;protocol=https"
-SRCREV = "629f3e3cd414294ee73bb3946e336f485fe8b504"
-S = "${WORKDIR}/git"
+ALLOW_EMPTY:${PN} = "1"
 
-EXTRA_OEMESON:append = " -Dtests=disabled"
+GPIO_PACKAGES = " \
+        ${PN}-monitor \
+        ${PN}-presence \
+"
+PACKAGE_BEFORE_PN += "${GPIO_PACKAGES}"