commit 6a6f5dbecc1d127a31147d45e7a7e3bb42a7cc6c
author Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Jun 23 18:37:54 2016 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Jun 30 13:37:49 2016 -0400
tree 3104750f025978cd282dc09d5e884f3d3056a7ce
parent 48cf9c0dad83d873cc67d631f8252e9559a62a6b

Fix invalid layer paths in non-removable

A number of the layer paths in the non-removable section
of the bblayers.conf templates had invalid paths.

Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

meta-firestone/conf/bblayers.conf.sample

diff --git a/meta-firestone/conf/bblayers.conf.sample b/meta-firestone/conf/bblayers.conf.sample
index c675a18..d231e88 100644
--- a/meta-firestone/conf/bblayers.conf.sample
+++ b/meta-firestone/conf/bblayers.conf.sample
@@ -19,9 +19,9 @@
   ##OEROOT##/meta \
   ##OEROOT##/meta-yocto \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-aspeed/meta-ast2400 \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openpower/meta-ibm/meta-firestone \
+  ##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-ibm \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone \
   "

meta-garrison/conf/bblayers.conf.sample

diff --git a/meta-garrison/conf/bblayers.conf.sample b/meta-garrison/conf/bblayers.conf.sample
index 76777e4..11bfa80 100644
--- a/meta-garrison/conf/bblayers.conf.sample
+++ b/meta-garrison/conf/bblayers.conf.sample
@@ -19,9 +19,9 @@
   ##OEROOT##/meta \
   ##OEROOT##/meta-yocto \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-aspeed/meta-ast2400 \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openpower/meta-ibm/meta-garrison \
+  ##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-ibm \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison \
   "

meta-palmetto/conf/bblayers.conf.sample

diff --git a/meta-palmetto/conf/bblayers.conf.sample b/meta-palmetto/conf/bblayers.conf.sample
index d0e0219..7156d9b 100644
--- a/meta-palmetto/conf/bblayers.conf.sample
+++ b/meta-palmetto/conf/bblayers.conf.sample
@@ -19,9 +19,9 @@
   ##OEROOT##/meta \
   ##OEROOT##/meta-yocto \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-aspeed/meta-ast2400 \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openpower/meta-ibm/meta-palmetto \
+  ##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-ibm \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \
   "

meta-witherspoon/conf/bblayers.conf.sample

diff --git a/meta-witherspoon/conf/bblayers.conf.sample b/meta-witherspoon/conf/bblayers.conf.sample
index 333c7ef..59942f1 100644
--- a/meta-witherspoon/conf/bblayers.conf.sample
+++ b/meta-witherspoon/conf/bblayers.conf.sample
@@ -19,9 +19,9 @@
   ##OEROOT##/meta \
   ##OEROOT##/meta-yocto \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-aspeed/meta-ast2500 \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openpower/meta-ibm/meta-witherspoon\
+  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
   "