| commit | 0e72d71a67f8d29df926af2a8c249a521ee62680 | [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 19:28:47 2020 -0400 |
| tree | 41b79f72ec15509067c292e957a281e31107585a | |
| parent | f14643da2deabab4b79e896acb4440a95aa54889 [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. (From meta-phosphor rev: 2641990831230d85ee7cb5fdc29450ad561a4799) Change-Id: Ie3154cc6ee8d257ffa92463c49d3755a15379663 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb b/meta-phosphor/recipes-core/systemd/phosphor-systemd-policy.bb similarity index 100% rename from meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb rename to meta-phosphor/recipes-core/systemd/phosphor-systemd-policy.bb
diff --git a/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/journald-maxlevel-policy.conf b/meta-phosphor/recipes-core/systemd/phosphor-systemd-policy/journald-maxlevel-policy.conf similarity index 100% rename from meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/journald-maxlevel-policy.conf rename to meta-phosphor/recipes-core/systemd/phosphor-systemd-policy/journald-maxlevel-policy.conf
diff --git a/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf b/meta-phosphor/recipes-core/systemd/phosphor-systemd-policy/service-restart-policy.conf similarity index 100% rename from meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf rename to meta-phosphor/recipes-core/systemd/phosphor-systemd-policy/service-restart-policy.conf
diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index 1aabe37..f1046de 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/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/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 41164a5..057509d 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/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"