1 files changed, 17 insertions, 22 deletions
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb
index e574682afc..4da5b49f7a 100644
--- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb
@@ -1,60 +1,55 @@
 SUMMARY = "Phosphor Host logger"
 DESCRIPTION = "Save log messages from host's console to the persistent storage."
 HOMEPAGE = "https://github.com/openbmc/phosphor-hostlogger"
-PR = "r1"
-PV = "1.0+git${SRCPV}"
-
-inherit pkgconfig meson
-inherit systemd
-
 # License info
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
 # Dependencies
 DEPENDS += " \
             phosphor-logging \
             zlib \
            "
-RDEPENDS:${PN} += "obmc-console"
-RRECOMMENDS:${PN} += "phosphor-debug-collector"
+SRCREV = "d68863396c608912a820926d8d98d92499f49ac2"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://github.com/openbmc/phosphor-hostlogger;branch=master;protocol=https"
 
 # Source code repository
 S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/openbmc/phosphor-hostlogger;branch=master;protocol=https"
-SRCREV = "d68863396c608912a820926d8d98d92499f49ac2"
+# Systemd service template
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE:${PN} = "hostlogger@.service"
+# Preset systemd units
+SYSTEMD_SERVICE:${PN} += "${@'${CUSTOM_SERVICES}' if len('${CUSTOM_SERVICES}') \
+                                                  else '${DEFAULT_SERVICE}'}"
+
+inherit pkgconfig meson
+inherit systemd
 
 # Disable unit tests
 EXTRA_OEMESON:append = " -Dtests=disabled"
 
-# Systemd service template
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE:${PN} = "hostlogger@.service"
+RDEPENDS:${PN} += "obmc-console"
+
+RRECOMMENDS:${PN} += "phosphor-debug-collector"
 
 # Default service instance to install (single-host mode)
 DEFAULT_INSTANCE = "ttyVUART0"
 DEFAULT_SERVICE = "hostlogger@${DEFAULT_INSTANCE}.service"
-
 # Multi-host mode setup - list of configuration files to install, can be added
 # via SRC_URI in a bbappend. The file name is the name of the service instance,
 # which should match the corresponding instance of the obmc-console service.
 CUSTOM_CONFIGS = "${@custom_configs('${WORKDIR}')}"
 CUSTOM_SERVICES = "${@custom_services('${CUSTOM_CONFIGS}')}"
-
-# Preset systemd units
-SYSTEMD_SERVICE:${PN} += "${@'${CUSTOM_SERVICES}' if len('${CUSTOM_SERVICES}') \
-                                                  else '${DEFAULT_SERVICE}'}"
-
 # Gets list of custom config files in a directory
 def custom_configs(workdir):
     if os.path.exists(workdir):
         return ' '.join([f for f in os.listdir(workdir) if f.endswith('.conf')])
-
 # Get list of custom service instances
 def custom_services(configs):
     return ' '.join(['hostlogger@' + i.replace('.conf', '.service') \
                      for i in configs.split()])
-
 do_install:append() {
   # Install config files
   if [ -n "${CUSTOM_CONFIGS}" ]; then