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 <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

4 files changed, 0 insertions, 46 deletions

diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-size-policy.conf b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-size-policy.conf
deleted file mode 100644
index fb84c6734..000000000
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-size-policy.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file overrides a default for journald
-#
-# - Set a maximum size for journald in filesystem
-#
-# See journald.conf(5) for details
-
-[Journal]
-SystemMaxUse=2.5M
diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-storage-policy.conf b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-storage-policy.conf
deleted file mode 100644
index eb746a56f..000000000
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-storage-policy.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file overrides a default for journald
-#
-# - Default journald to write to persistent storage
-#
-# See journald.conf(5) for details
-
-[Journal]
-Storage=persistent
diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/systemd-journald-override.conf b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/systemd-journald-override.conf
deleted file mode 100644
index 0ca86f863..000000000
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/systemd-journald-override.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-Wants=local-fs.target
-After=local-fs.target
diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index 500c91df5..000000000
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,27 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_ibm-ac-server = " file://journald-storage-policy.conf"
-SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf"
-SRC_URI_append_ibm-ac-server = " file://journald-size-policy.conf"
-
-SRC_URI_append_rainier = " file://journald-storage-policy.conf"
-SRC_URI_append_rainier = " file://systemd-journald-override.conf"
-SRC_URI_append_rainier = " file://journald-size-policy.conf"
-
-FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
-FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
-FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
-
-FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
-FILES_${PN}_append_rainier = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
-FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
-
-do_install_append_ibm-ac-server() {
-        install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
-        install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
-        install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
-}
-do_install_append_rainier() {
-        install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
-        install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
-        install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
-}