1 files changed, 8 insertions, 14 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/fru/default-fru.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/fru/default-fru.bb
index b113547da..a8dd35487 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/fru/default-fru.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/fru/default-fru.bb
@@ -1,18 +1,15 @@
 SUMMARY = "Default Fru"
 DESCRIPTION = "Builds a default FRU file at runtime based on board ID"
 
-inherit systemd
+inherit obmc-phosphor-systemd
 inherit cmake
 
-SYSTEMD_SERVICE:${PN} = "SetBaseboardFru.service"
-
-S = "${WORKDIR}"
-SRC_URI = "file://checkFru.sh \
-           file://decodeBoardID.sh \
-           file://SetBaseboardFru.service \
-           file://mkfru.cpp \
-           file://CMakeLists.txt \
+SRC_URI = "file://checkFru.sh;subdir=${BP} \
+           file://decodeBoardID.sh;subdir=${BP} \
+           file://mkfru.cpp;subdir=${BP} \
+           file://CMakeLists.txt;subdir=${BP} \
            "
+SYSTEMD_SERVICE:${PN} = "SetBaseboardFru.service"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "\
@@ -24,9 +21,6 @@ RDEPENDS:${PN} = "bash"
 
 do_install:append() {
     install -d ${D}${bindir}
-    install -m 0755 ${S}/checkFru.sh ${D}/${bindir}/checkFru.sh
-    install -m 0755 ${S}/decodeBoardID.sh ${D}/${bindir}/decodeBoardID.sh
-
-    install -d ${D}${base_libdir}/systemd/system
-    install -m 0644 ${S}/SetBaseboardFru.service ${D}${base_libdir}/systemd/system
+    install -m 0755 ${S}/checkFru.sh ${D}${bindir}/checkFru.sh
+    install -m 0755 ${S}/decodeBoardID.sh ${D}${bindir}/decodeBoardID.sh
 }