From 128f4243bcda2d770a9908c89ad3eef873c414d8 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Tue, 28 Apr 2020 16:35:16 -0400
Subject: meta-ibm: drop meta-witherspoon

All the metadata in meta-witherspoon has been moved to meta-ibm.  A
small set of config files remained while the OpenBMC CI infrastructure
was updated.  That update has occurred so the remaining files can now be
removed.

(From meta-ibm rev: ea56691750114f9203f50b3d3455f9c6fb148291)

Change-Id: I44b4bed305b136ac62031ae7fa98d27d2967a5ff
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
---
 .../meta-witherspoon/conf/bblayers.conf.sample     | 31 ----------------------
 meta-ibm/meta-witherspoon/conf/conf-notes.txt      | 12 ---------
 meta-ibm/meta-witherspoon/conf/layer.conf          | 10 -------
 meta-ibm/meta-witherspoon/conf/local.conf.sample   | 21 ---------------
 4 files changed, 74 deletions(-)
 delete mode 100644 meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
 delete mode 100644 meta-ibm/meta-witherspoon/conf/conf-notes.txt
 delete mode 100644 meta-ibm/meta-witherspoon/conf/layer.conf
 delete mode 100644 meta-ibm/meta-witherspoon/conf/local.conf.sample

diff --git a/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
deleted file mode 100644
index 63a444ed6..000000000
--- a/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,31 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "8"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ibm \
-  ##OEROOT##/meta-ibm/meta-witherspoon \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ibm \
-  ##OEROOT##/meta-ibm/meta-witherspoon \
-  "
diff --git a/meta-ibm/meta-witherspoon/conf/conf-notes.txt b/meta-ibm/meta-witherspoon/conf/conf-notes.txt
deleted file mode 100644
index 112353d6f..000000000
--- a/meta-ibm/meta-witherspoon/conf/conf-notes.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Sample meta-witherspoon build invocations:
-
-mihawk:
-DISTRO=openbmc-witherspoon MACHINE=mihawk bitbake obmc-phosphor-image
-swift:
-DISTRO=openbmc-witherspoon MACHINE=swift bitbake obmc-phosphor-image
-witherspoon:
-DISTRO=openbmc-witherspoon MACHINE=witherspoon bitbake obmc-phosphor-image
-witherspoon-tacoma:
-DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image
-witherspoon-128:
-DISTRO=openbmc-witherspoon MACHINE=witherspoon-128 bitbake obmc-phosphor-image
diff --git a/meta-ibm/meta-witherspoon/conf/layer.conf b/meta-ibm/meta-witherspoon/conf/layer.conf
deleted file mode 100644
index 2f6f9364b..000000000
--- a/meta-ibm/meta-witherspoon/conf/layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "witherspoon-layer"
-BBFILE_PATTERN_witherspoon-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_witherspoon-layer = "warrior zeus dunfell"
diff --git a/meta-ibm/meta-witherspoon/conf/local.conf.sample b/meta-ibm/meta-witherspoon/conf/local.conf.sample
deleted file mode 100644
index 94e76f3db..000000000
--- a/meta-ibm/meta-witherspoon/conf/local.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-#MACHINE ?= "mihawk"
-#MACHINE ?= "swift"
-#MACHINE ?= "witherspoon-128"
-#MACHINE ?= "rainier"
-MACHINE ??= "witherspoon"
-DISTRO ?= "openbmc-witherspoon"
-PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
-- 
cgit v1.2.3