1 files changed, 22 insertions, 26 deletions
diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb
index 8c171d625c..f87f13a56b 100644
--- a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb
@@ -1,34 +1,41 @@
+# The below configs are expected to be overriden by machine layer
+SUMMARY = "Phosphor PSU software manager"
+DESCRIPTION = "Providing PSU firmware version and upgrade"
 HOMEPAGE = "https://github.com/openbmc/phosphor-psu-code-mgmt"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRC_URI += "git://github.com/openbmc/phosphor-psu-code-mgmt;branch=master;protocol=https"
+DEPENDS = " \
+         phosphor-logging \
+         phosphor-dbus-interfaces \
+         sdbusplus \
+         openssl \
+         "
 SRCREV = "97092314b107744e290b3fd6cf0eeef43247400c"
-SUMMARY = "Phosphor PSU software manager"
-DESCRIPTION = "Providing PSU firmware version and upgrade"
-
-PR = "r1"
 PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI += "git://github.com/openbmc/phosphor-psu-code-mgmt;branch=master;protocol=https"
+
+S = "${WORKDIR}/git"
+SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Software.Psu.Updater.service"
+SYSTEMD_SERVICE:${PN} += "psu-update@.service"
 
 inherit meson
 inherit pkgconfig
 inherit obmc-phosphor-systemd
 
-S = "${WORKDIR}/git"
-
-DEPENDS = " \
-         phosphor-logging \
-         phosphor-dbus-interfaces \
-         sdbusplus \
-         openssl \
-         "
+EXTRA_OEMESON = " \
+        -Dtests=disabled \
+        ${PSU_VERSION_UTIL} \
+        ${PSU_VERSION_COMPARE_UTIL} \
+        ${PSU_UPDATE_SERVICE} \
+        "
 
 # The default config of this repo depends on utils from phosphor-power.
 # If your system does not depend on phosphor-power, please use
 # RDEPENDS:${PN}:remove to remove the dependency.
 RDEPENDS:${PN} += "phosphor-power"
 
-# The below configs are expected to be overriden by machine layer
-
 ## The psutils here comes from phosphor-power repo where
 ## * PSU_VERSION_UTIL accepts a PSU inventory path and returns the PSU
 ##   firmware version string
@@ -36,17 +43,6 @@ RDEPENDS:${PN} += "phosphor-power"
 ##   the newest version string
 PSU_VERSION_UTIL ?= "-DPSU_VERSION_UTIL='/usr/bin/psutils --raw --get-version'"
 PSU_VERSION_COMPARE_UTIL ?= "-DPSU_VERSION_COMPARE_UTIL='/usr/bin/psutils --raw --compare'"
-
 ## The psu-update@.service from repo is an example service that only prints a log and fails
 ## Override it in a machine layer to invoke the psu update util
 PSU_UPDATE_SERVICE ?= "-DPSU_UPDATE_SERVICE=psu-update@.service"
-
-EXTRA_OEMESON = " \
-        -Dtests=disabled \
-        ${PSU_VERSION_UTIL} \
-        ${PSU_VERSION_COMPARE_UTIL} \
-        ${PSU_UPDATE_SERVICE} \
-        "
-
-SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Software.Psu.Updater.service"
-SYSTEMD_SERVICE:${PN} += "psu-update@.service"