From 961354551f5a6e772bae52b3587dc09519c5d5f6 Mon Sep 17 00:00:00 2001
From: Patrick Venture <venture@google.com>
Date: Sun, 21 Oct 2018 08:28:07 -0700
Subject: meta-phosphor: dbus: dbus-monitor: drop symlink

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

(From meta-phosphor rev: e4b4080a41eec644531db57b1c7e02da5d4d2cc3)

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

(limited to 'meta-phosphor')

diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
deleted file mode 100644
index 184127f15..000000000
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-SUMMARY = "Phosphor DBus Monitor"
-DESCRIPTION = "Phosphor DBus Monitor is a general purpose DBus application \
-that watches DBus traffic for events and takes actions based on those events."
-PR = "r1"
-HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor"
-SRCREV = "0b45a3ce6d21e70453ed3d4a7dfcc2bef0865e7f"
-
-inherit autotools \
-        pkgconfig \
-        pythonnative \
-        phosphor-dbus-monitor \
-        obmc-phosphor-systemd
-
-PACKAGE_BEFORE_PN = "phosphor-msl-verify"
-SYSTEMD_PACKAGES = "${PN} phosphor-msl-verify"
-SYSTEMD_SERVICE_phosphor-msl-verify = "phosphor-msl-verify.service"
-
-DEPENDS += " \
-        ${PN}-config-native \
-        phosphor-logging \
-        autoconf-archive-native \
-        sdbusplus-native \
-        gtest \
-        phosphor-snmp \
-        "
-RDEPENDS_${PN} += " \
-        sdbusplus \
-        phosphor-dbus-interfaces \
-        phosphor-logging \
-        phosphor-snmp \
-        "
-
-RDEPENDS_phosphor-msl-verify += " \
-        sdbusplus \
-        phosphor-dbus-interfaces \
-        phosphor-logging \
-        phosphor-snmp \
-        "
-FILES_phosphor-msl-verify = "${sbindir}/phosphor-msl-verify"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF = " \
-        YAML_PATH=${STAGING_DIR_NATIVE}${config_dir} \
-        "
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb
deleted file mode 120000
index e4d34a197..000000000
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb
+++ /dev/null
@@ -1 +0,0 @@
-phosphor-dbus-monitor.bb
\ No newline at end of file
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb
new file mode 100644
index 000000000..fb850b1f8
--- /dev/null
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb
@@ -0,0 +1,49 @@
+SUMMARY = "Phosphor DBus Monitor"
+DESCRIPTION = "Phosphor DBus Monitor is a general purpose DBus application \
+that watches DBus traffic for events and takes actions based on those events."
+PR = "r1"
+PV = "1.0+git${SRCPV}"
+HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor"
+SRCREV = "0b45a3ce6d21e70453ed3d4a7dfcc2bef0865e7f"
+
+inherit autotools \
+        pkgconfig \
+        pythonnative \
+        phosphor-dbus-monitor \
+        obmc-phosphor-systemd
+
+PACKAGE_BEFORE_PN = "phosphor-msl-verify"
+SYSTEMD_PACKAGES = "${PN} phosphor-msl-verify"
+SYSTEMD_SERVICE_phosphor-msl-verify = "phosphor-msl-verify.service"
+
+DEPENDS += " \
+        ${PN}-config-native \
+        phosphor-logging \
+        autoconf-archive-native \
+        sdbusplus-native \
+        gtest \
+        phosphor-snmp \
+        "
+RDEPENDS_${PN} += " \
+        sdbusplus \
+        phosphor-dbus-interfaces \
+        phosphor-logging \
+        phosphor-snmp \
+        "
+
+RDEPENDS_phosphor-msl-verify += " \
+        sdbusplus \
+        phosphor-dbus-interfaces \
+        phosphor-logging \
+        phosphor-snmp \
+        "
+FILES_phosphor-msl-verify = "${sbindir}/phosphor-msl-verify"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = " \
+        YAML_PATH=${STAGING_DIR_NATIVE}${config_dir} \
+        "
-- 
cgit v1.2.1