From 7e32f4c2959bcde7b663a9de92dfadcf20b708b5 Mon Sep 17 00:00:00 2001
From: Patrick Venture <venture@google.com>
Date: Sun, 21 Oct 2018 08:24:24 -0700
Subject: meta-phosphor: gpio-monitor: drop symlink

Drop symlink and rename bb for phosphor-gpio-monitor.

(From meta-phosphor rev: 8a0529bba499b3ce132821ed2ec3c3ae8a5033e4)

Change-Id: Ifc4bf184040a755eaea9377cb61ecae9c7101b11
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../recipes-phosphor/gpio/phosphor-gpio-monitor.bb | 52 ---------------------
 .../gpio/phosphor-gpio-monitor_git.bb              | 54 +++++++++++++++++++++-
 2 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
 mode change 120000 => 100644 meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb

(limited to 'meta-phosphor')

diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
deleted file mode 100644
index d94e245b3..000000000
--- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
+++ /dev/null
@@ -1,52 +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 = "3c4a23e7764c7785d18cb30340a6d185022a797a"
-S = "${WORKDIR}/git"
diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
deleted file mode 120000
index 711c057ed..000000000
--- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
+++ /dev/null
@@ -1 +0,0 @@
-phosphor-gpio-monitor.bb
\ No newline at end of file
diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
new file mode 100644
index 000000000..750845897
--- /dev/null
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
@@ -0,0 +1,53 @@
+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 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 = "3c4a23e7764c7785d18cb30340a6d185022a797a"
+S = "${WORKDIR}/git"
-- 
cgit v1.2.3