| commit | 2641990831230d85ee7cb5fdc29450ad561a4799 | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Wed Aug 12 07:03:47 2020 -0400 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Aug 13 23:24:28 2020 +0000 |
| tree | 4b7e1422f6d3e5f9f5e2b5fb38cb75a4746697a1 | |
| parent | 1b9a74965ae664726e82ff7941b2d046392fb0f3 [diff] |
meta-phosphor: systemd-policy: move to systemd Don't install systemd policy if: - systemd is not being installed - a non phosphor distro Use RRECOMMENDS for easy opt-out in Phosphor based distros. Change-Id: Icabde199863f351d1bcc04eb1a80e974324a4488 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb b/recipes-core/systemd/phosphor-systemd-policy.bb similarity index 100% rename from recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb rename to recipes-core/systemd/phosphor-systemd-policy.bb
diff --git a/recipes-phosphor/systemd-policy/phosphor-systemd-policy/journald-maxlevel-policy.conf b/recipes-core/systemd/phosphor-systemd-policy/journald-maxlevel-policy.conf similarity index 100% rename from recipes-phosphor/systemd-policy/phosphor-systemd-policy/journald-maxlevel-policy.conf rename to recipes-core/systemd/phosphor-systemd-policy/journald-maxlevel-policy.conf
diff --git a/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf b/recipes-core/systemd/phosphor-systemd-policy/service-restart-policy.conf similarity index 100% rename from recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf rename to recipes-core/systemd/phosphor-systemd-policy/service-restart-policy.conf
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend index 1aabe37..f1046de 100644 --- a/recipes-core/systemd/systemd_%.bbappend +++ b/recipes-core/systemd/systemd_%.bbappend
@@ -25,3 +25,5 @@ ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd" ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" ALTERNATIVE_PRIORITY[init] ?= "300" + +RRECOMMENDS_${PN}_append_openbmc-phosphor = " phosphor-systemd-policy"
diff --git a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 41164a5..057509d 100644 --- a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -44,7 +44,6 @@ phosphor-nslcd-authority-cert-config \ obmc-ikvm \ phosphor-dbus-monitor \ - phosphor-systemd-policy \ " SUMMARY_${PN}-devtools = "Development tools"