diff options
-rw-r--r-- | meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend | 3 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 1 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb | 15 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf (renamed from meta-phosphor/common/recipes-core/systemd/systemd/service-restart-policy.conf) | 0 |
4 files changed, 16 insertions, 3 deletions
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend index 07b3038d0..b403069a5 100644 --- a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend @@ -7,7 +7,6 @@ PACKAGECONFIG_remove = "machined hibernate ldconfig binfmt backlight localed \ 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 @@ SRC_URI += "file://0005-dont-return-error-if-unable-to-create-network-namespace. 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 56d78d138..5c184babf 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 @@ SUMMARY_${PN}-extras = "Extra features" 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 000000000..34abf5008 --- /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 index 0bd049b41..0bd049b41 100644 --- 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 |