Changed name of barreleye parent layer

7 files changed, 7 insertions, 7 deletions

diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf
index a0f16b490..9bc3e9395 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/layer.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf
@@ -1,5 +1,5 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
-BBFILE_COLLECTIONS += "foxconn"
-BBFILE_PATTERN_foxconn = ""
+BBFILE_COLLECTIONS += "rackspace"
+BBFILE_PATTERN_rackspace = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/machine/include/foxconn.inc b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/machine/include/rackspace.inc
index c79ddd777..c79ddd777 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/machine/include/foxconn.inc
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/machine/include/rackspace.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
index f30ab15f5..a261b26ce 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
@@ -12,8 +12,8 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-foxconn \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
@@ -22,6 +22,6 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-aspeed/meta-ast2400 \
   ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-openpower/meta-foxconn \
-  ##OEROOT##/meta-openpower/meta-foxconn/meta-barreleye \
+  ##OEROOT##/meta-openpower/meta-rackspace \
+  ##OEROOT##/meta-openpower/meta-rackspace/meta-barreleye \
   "
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/conf-notes.txt b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/conf-notes.txt
index 9b3c01a55..9b3c01a55 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/conf-notes.txt
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/conf-notes.txt
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/layer.conf
index 313b8fccb..313b8fccb 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/layer.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/layer.conf
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
index 8799d8dd0..8799d8dd0 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/local.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
index 3ab8bb0ed..6c8f0bffd 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/machine/barreleye.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
@@ -3,7 +3,7 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-palmetto.dtb"
 
 require conf/machine/include/ast2400.inc
 require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/foxconn.inc
+require conf/machine/include/rackspace.inc
 
 UBOOT_MACHINE_barreleye = "palmetto_config"
 UBOOT_ENTRYPOINT = "0x40008000"