Move phosphor overrides of systemd into own recipe
Phosphor specific overrides to systemd should be stored
within its own recipe and pulled in via the phosphor layer.
This helps distinguish systemd specific overrides with
phosphor overrides.
Tested: Verified service-restart-policy.conf was still
pulled in as expected in witherspoon QEMU
Change-Id: I32110fc2edd3abd2bb0008c63dd4ad7828b762b8
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
index 07b3038..b403069 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
@@ -7,7 +7,6 @@
manpages"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
SRC_URI += "file://default.network"
-SRC_URI += "file://service-restart-policy.conf"
SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch"
SRC_URI += "file://0003-basic-Factor-out-string-checking-from-name_to_prefix.patch"
SRC_URI += "file://0004-basic-Use-path-escaping-when-mangling-path-instances.patch"
@@ -17,9 +16,7 @@
RRECOMMENDS_${PN} += "obmc-targets"
FILES_${PN} += "${systemd_unitdir}/network/default.network"
-FILES_${PN} += "${systemd_unitdir}/system.conf.d/service-restart-policy.conf"
do_install_append() {
install -m 644 ${WORKDIR}/default.network ${D}${systemd_unitdir}/network/
- install -m 644 -D ${WORKDIR}/service-restart-policy.conf ${D}${systemd_unitdir}/system.conf.d/service-restart-policy.conf
}
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 56d78d1..5c184ba 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -39,6 +39,7 @@
RDEPENDS_${PN}-extras = " \
phosphor-rest \
phosphor-dbus-monitor \
+ phosphor-systemd-policy \
"
SUMMARY_${PN}-extrasdev = "Development features"
diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
new file mode 100644
index 0000000..34abf50
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Phosphor systemd configuration overrides"
+DESCRIPTION = "Overrides for systemd and its applications"
+PR = "r1"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+DEPENDS += "systemd"
+
+SRC_URI = "file://service-restart-policy.conf"
+FILES_${PN} += "${systemd_unitdir}/system.conf.d/service-restart-policy.conf"
+
+do_install() {
+ install -m 644 -D ${WORKDIR}/service-restart-policy.conf ${D}${systemd_unitdir}/system.conf.d/service-restart-policy.conf
+}
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/service-restart-policy.conf b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/systemd/service-restart-policy.conf
rename to meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf