meta-phosphor: logging: drop symlink

Drop symlink and rename bb for phosphor-logging.

(From meta-phosphor rev: f6dd86b05139463aa8b455d52c58045fe82824de)

Change-Id: Id5e50859bb99b8cf4fa3ea56abfd2ceff2b5738e
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

2 files changed, 105 insertions, 105 deletions

diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb
deleted file mode 100644
index 3bc8a57047..0000000000
--- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb
+++ /dev/null
@@ -1,104 +0,0 @@
-SUMMARY = "Phosphor OpenBMC event and error logging"
-DESCRIPTION = "An error and event log daemon application, and \
-               supporting tools for OpenBMC."
-HOMEPAGE = "https://github.com/openbmc/phosphor-logging"
-PR = "r1"
-
-inherit autotools pkgconfig
-inherit pythonnative
-inherit obmc-phosphor-license
-inherit obmc-phosphor-dbus-service
-inherit phosphor-logging
-inherit phosphor-dbus-yaml
-
-DEPENDS += "autoconf-archive-native"
-DEPENDS += "systemd"
-DEPENDS += "python-mako-native"
-DEPENDS += "python-pyyaml-native"
-DEPENDS += "sdbusplus sdbusplus-native"
-DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native"
-DEPENDS += "virtual/phosphor-logging-callouts"
-DEPENDS += "phosphor-logging-error-logs-native"
-DEPENDS += "phosphor-logging-native"
-DEPENDS += "libcereal"
-
-PACKAGE_BEFORE_PN = "${PN}-test"
-FILES_${PN}-test = "${bindir}/*-test"
-
-PACKAGE_BEFORE_PN += "${PN}-elog"
-FILES_${PN}-elog += "${elog_dir}"
-
-# Package configuration
-LOGGING_PACKAGES = " \
-        ${PN}-base \
-        phosphor-rsyslog-config \
-"
-
-ALLOW_EMPTY_${PN} = "1"
-PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}"
-SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}"
-DBUS_PACKAGES = "${LOGGING_PACKAGES}"
-
-RDEPENDS_${PN}-base += "sdbusplus phosphor-dbus-interfaces"
-FILES_${PN}-base += " \
-        ${sbindir}/phosphor-log-manager \
-        ${libdir}/libphosphor_logging.so.* \
-"
-DBUS_SERVICE_${PN}-base += "xyz.openbmc_project.Logging.service"
-
-RDEPENDS_phosphor-rsyslog-config += "sdbusplus phosphor-dbus-interfaces"
-DBUS_SERVICE_phosphor-rsyslog-config += "xyz.openbmc_project.Syslog.Config.service"
-FILES_phosphor-rsyslog-config += " \
-        ${sbindir}/phosphor-rsyslog-conf \
-"
-
-SRC_URI += "git://github.com/openbmc/phosphor-logging"
-SRCREV = "aabb92ef56c4faa8f05487e9fcdf83f1053f1a22"
-
-S = "${WORKDIR}/git"
-
-# Do not DEPEND on the specified packages for native build
-# as they will not be available in host machine
-DEPENDS_remove_class-native = " \
-        virtual/phosphor-logging-callouts \
-        sdbus++ \
-        systemd \
-        libcereal \
-        "
-
-# Do not DEPEND on the specified packages for native SDK build
-# as they will not be available in host machine
-DEPENDS_remove_class-nativesdk = " \
-        virtual/phosphor-logging-callouts \
-        sdbus++-native \
-        libcereal \
-        systemd \
-        phosphor-dbus-interfaces \
-        "
-
-PACKAGECONFIG ??= "metadata-processing install_scripts"
-
-PACKAGECONFIG[metadata-processing] = " \
-        --enable-metadata-processing, \
-        --disable-metadata-processing, , \
-        "
-
-# Provide a means to enable/disable install_scripts feature
-PACKAGECONFIG[install_scripts] = " \
-        --enable-install_scripts, \
-        --disable-install_scripts, ,\
-        "
-
-# Enable install_scripts during native and native SDK build
-PACKAGECONFIG_add_class-native = "install_scripts"
-PACKAGECONFIG_add_class-nativesdk = "install_scripts"
-
-# Disable install_scripts during target build
-PACKAGECONFIG_remove_class-target = "install_scripts"
-
-EXTRA_OECONF = " \
-        YAML_DIR=${STAGING_DIR_NATIVE}${yaml_dir} \
-        CALLOUTS_YAML=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \
-        "
-
-BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
index b66762de35..7805c9cacd 120000..100644
--- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
@@ -1 +1,105 @@
-phosphor-logging.bb
\ No newline at end of file
+SUMMARY = "Phosphor OpenBMC event and error logging"
+DESCRIPTION = "An error and event log daemon application, and \
+               supporting tools for OpenBMC."
+HOMEPAGE = "https://github.com/openbmc/phosphor-logging"
+PR = "r1"
+PV = "1.0+git${SRCPV}"
+
+inherit autotools pkgconfig
+inherit pythonnative
+inherit obmc-phosphor-license
+inherit obmc-phosphor-dbus-service
+inherit phosphor-logging
+inherit phosphor-dbus-yaml
+
+DEPENDS += "autoconf-archive-native"
+DEPENDS += "systemd"
+DEPENDS += "python-mako-native"
+DEPENDS += "python-pyyaml-native"
+DEPENDS += "sdbusplus sdbusplus-native"
+DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native"
+DEPENDS += "virtual/phosphor-logging-callouts"
+DEPENDS += "phosphor-logging-error-logs-native"
+DEPENDS += "phosphor-logging-native"
+DEPENDS += "libcereal"
+
+PACKAGE_BEFORE_PN = "${PN}-test"
+FILES_${PN}-test = "${bindir}/*-test"
+
+PACKAGE_BEFORE_PN += "${PN}-elog"
+FILES_${PN}-elog += "${elog_dir}"
+
+# Package configuration
+LOGGING_PACKAGES = " \
+        ${PN}-base \
+        phosphor-rsyslog-config \
+"
+
+ALLOW_EMPTY_${PN} = "1"
+PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}"
+SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}"
+DBUS_PACKAGES = "${LOGGING_PACKAGES}"
+
+RDEPENDS_${PN}-base += "sdbusplus phosphor-dbus-interfaces"
+FILES_${PN}-base += " \
+        ${sbindir}/phosphor-log-manager \
+        ${libdir}/libphosphor_logging.so.* \
+"
+DBUS_SERVICE_${PN}-base += "xyz.openbmc_project.Logging.service"
+
+RDEPENDS_phosphor-rsyslog-config += "sdbusplus phosphor-dbus-interfaces"
+DBUS_SERVICE_phosphor-rsyslog-config += "xyz.openbmc_project.Syslog.Config.service"
+FILES_phosphor-rsyslog-config += " \
+        ${sbindir}/phosphor-rsyslog-conf \
+"
+
+SRC_URI += "git://github.com/openbmc/phosphor-logging"
+SRCREV = "aabb92ef56c4faa8f05487e9fcdf83f1053f1a22"
+
+S = "${WORKDIR}/git"
+
+# Do not DEPEND on the specified packages for native build
+# as they will not be available in host machine
+DEPENDS_remove_class-native = " \
+        virtual/phosphor-logging-callouts \
+        sdbus++ \
+        systemd \
+        libcereal \
+        "
+
+# Do not DEPEND on the specified packages for native SDK build
+# as they will not be available in host machine
+DEPENDS_remove_class-nativesdk = " \
+        virtual/phosphor-logging-callouts \
+        sdbus++-native \
+        libcereal \
+        systemd \
+        phosphor-dbus-interfaces \
+        "
+
+PACKAGECONFIG ??= "metadata-processing install_scripts"
+
+PACKAGECONFIG[metadata-processing] = " \
+        --enable-metadata-processing, \
+        --disable-metadata-processing, , \
+        "
+
+# Provide a means to enable/disable install_scripts feature
+PACKAGECONFIG[install_scripts] = " \
+        --enable-install_scripts, \
+        --disable-install_scripts, ,\
+        "
+
+# Enable install_scripts during native and native SDK build
+PACKAGECONFIG_add_class-native = "install_scripts"
+PACKAGECONFIG_add_class-nativesdk = "install_scripts"
+
+# Disable install_scripts during target build
+PACKAGECONFIG_remove_class-target = "install_scripts"
+
+EXTRA_OECONF = " \
+        YAML_DIR=${STAGING_DIR_NATIVE}${yaml_dir} \
+        CALLOUTS_YAML=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \
+        "
+
+BBCLASSEXTEND += "native nativesdk"