meta-ibm: remove p10bmc-distributed machine
We are pursuing a different design point and no longer have use for this
machine.
Change-Id: I68f9333ebdb9f3a88efa784eaef2226d9d59478b
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-ibm/conf/machine/p10bmc-distributed.conf b/meta-ibm/conf/machine/p10bmc-distributed.conf
deleted file mode 100644
index c8dbede..0000000
--- a/meta-ibm/conf/machine/p10bmc-distributed.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-MACHINEOVERRIDES =. "p10bmc:"
-require conf/machine/p10bmc.conf
-require conf/distro/include/etcd.inc
-
diff --git a/meta-ibm/conf/templates/default/conf-notes.txt b/meta-ibm/conf/templates/default/conf-notes.txt
index 9034e83..de04a8d 100644
--- a/meta-ibm/conf/templates/default/conf-notes.txt
+++ b/meta-ibm/conf/templates/default/conf-notes.txt
@@ -2,8 +2,6 @@
p10bmc:
MACHINE=p10bmc bitbake obmc-phosphor-image
-p10bmc-distributed:
-MACHINE=p10bmc-distributed bitbake obmc-phosphor-image
swift:
MACHINE=swift bitbake obmc-phosphor-image
witherspoon:
diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
index a82f62c..745071f 100644
--- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,7 +1,6 @@
OBMC_IMAGE_EXTRA_INSTALL:append:ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-hostname"
OBMC_IMAGE_EXTRA_INSTALL:remove:witherspoon-tacoma = " liberation-fonts uart-render-controller"
OBMC_IMAGE_EXTRA_INSTALL:append:p10bmc = " mboxd"
-OBMC_IMAGE_EXTRA_INSTALL:append:p10bmc-distributed = " etcd"
IMAGE_FEATURES:append = " obmc-dbus-monitor"