From e161514219e0dc8a957dabbb8529fb9fcac4e115 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 22 Apr 2020 14:06:02 -0400 Subject: meta-ibm: move all meta-witherspoon metadata The metadata common to all IBM systems is confusingly split between meta-ibm and meta-witherspoon. Move everything to meta-ibm. The meta-ibm README is re-written to more accurately reflect the scope of the layer. Allow the configuration samples (bblayers.conf.sample, local.conf.sample) to be sourced from either meta-ibm or meta-witherspoon until such a time that any workflows and tooling have had the opportunity to move to meta-ibm. (From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442) Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab Signed-off-by: Brad Bishop Signed-off-by: Andrew Geissler --- meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf (limited to 'meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf') diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf new file mode 100644 index 000000000..90b1e810e --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf @@ -0,0 +1,2 @@ +[Unit] +Conflicts=obmc-fan-watchdog-takeover.target -- cgit v1.2.3