Move meta-intel to meta-intel-openbmc

meta-intel conflicts with the upstream yocto meta layer of the same
name.  This commit renames meta-intel to meta-intel-openbmc and updates
all the relevant bblayers files with the new name.

This is to pave the way for allowing the yocto meta-intel in the tree,
which would allow the use of generic-x86 machine type, which would allow
building and running tests natively.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ia19a7a4a10245c1c2f85f6da216997cb6a836daa

39 files changed, 3 insertions, 3 deletions

diff --git a/meta-intel/COPYING.MIT b/meta-intel-openbmc/COPYING.MIT
index 89de35479..89de35479 100644
--- a/meta-intel/COPYING.MIT
+++ b/meta-intel-openbmc/COPYING.MIT
diff --git a/meta-intel/COPYING.apache-2.0 b/meta-intel-openbmc/COPYING.apache-2.0
index 67db85882..67db85882 100644
--- a/meta-intel/COPYING.apache-2.0
+++ b/meta-intel-openbmc/COPYING.apache-2.0
diff --git a/meta-intel/LICENSE b/meta-intel-openbmc/LICENSE
index a90db84a3..a90db84a3 100644
--- a/meta-intel/LICENSE
+++ b/meta-intel-openbmc/LICENSE
diff --git a/meta-intel/MAINTAINERS b/meta-intel-openbmc/MAINTAINERS
index 9a27e5d45..9a27e5d45 100644
--- a/meta-intel/MAINTAINERS
+++ b/meta-intel-openbmc/MAINTAINERS
diff --git a/meta-intel/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
index e515b5f57..e515b5f57 100644
--- a/meta-intel/conf/layer.conf
+++ b/meta-intel-openbmc/conf/layer.conf
diff --git a/meta-intel/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc
index 738d103e5..738d103e5 100644
--- a/meta-intel/conf/machine/include/intel.inc
+++ b/meta-intel-openbmc/conf/machine/include/intel.inc
diff --git a/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
index 6b24c522c..6b24c522c 100644
--- a/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
diff --git a/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb b/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb
index bc046e5a2..bc046e5a2 100644
--- a/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb
diff --git a/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend b/meta-intel-openbmc/meta-common/recipes-core/systemd/obmc-targets.bbappend
index 090b40e40..090b40e40 100644
--- a/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-core/systemd/obmc-targets.bbappend
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
index 8f3a2bc31..8f3a2bc31 100644
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
+++ b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
index 5a8c5cc10..5a8c5cc10 100644
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
+++ b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf
index 14bcc0781..14bcc0781 100644
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf
+++ b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf
index 46a287eef..46a287eef 100644
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf
+++ b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
index a6ba28d86..a6ba28d86 100644
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
+++ b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
index c42693787..c42693787 100644
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
index 20bd1bd36..20bd1bd36 100755
--- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
diff --git a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
index 8c0dfbf1c..8c0dfbf1c 100644
--- a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
+++ b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
diff --git a/meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb
index 0399ad6c9..0399ad6c9 100644
--- a/meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
index 0d1d016fe..0d1d016fe 100644
--- a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb
index cdb88bbfe..cdb88bbfe 100644
--- a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
index ef991a58b..ef991a58b 100644
--- a/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
index 99494717f..99494717f 100644
--- a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 4521fe8f8..4521fe8f8 100644
--- a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 4e24bab9e..4e24bab9e 100644
--- a/meta-intel/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 876567f9a..876567f9a 100644
--- a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
index cf5a28303..cf5a28303 100644
--- a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index e8cbbe928..e8cbbe928 100644
--- a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
index 20df1185b..20df1185b 100644
--- a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
diff --git a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
index 813ffbfd4..813ffbfd4 100755
--- a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
diff --git a/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
index 3e769e174..3e769e174 100644
--- a/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json b/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
index 1543a6249..1543a6249 100644
--- a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
index 590e9e629..590e9e629 100644
--- a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
diff --git a/meta-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
index 900caca78..c208e10fc 100644
--- a/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
+++ b/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
@@ -1,6 +1,6 @@
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "8"
+LCONF_VERSION = "9"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -15,6 +15,6 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-intel \
-  ##OEROOT##/meta-intel/meta-s2600wf \
+  ##OEROOT##/meta-intel-openbmc \
+  ##OEROOT##/meta-intel-openbmc/meta-s2600wf \
 "
diff --git a/meta-intel/meta-s2600wf/conf/conf-notes.txt b/meta-intel-openbmc/meta-s2600wf/conf/conf-notes.txt
index 5314bf4e6..5314bf4e6 100644
--- a/meta-intel/meta-s2600wf/conf/conf-notes.txt
+++ b/meta-intel-openbmc/meta-s2600wf/conf/conf-notes.txt
diff --git a/meta-intel/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
index c5001beec..c5001beec 100644
--- a/meta-intel/meta-s2600wf/conf/layer.conf
+++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
diff --git a/meta-intel/meta-s2600wf/conf/local.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample
index a6ac9e158..a6ac9e158 100644
--- a/meta-intel/meta-s2600wf/conf/local.conf.sample
+++ b/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample
diff --git a/meta-intel/meta-s2600wf/conf/machine/s2600wf.conf b/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf
index d0ca8a3c3..d0ca8a3c3 100644
--- a/meta-intel/meta-s2600wf/conf/machine/s2600wf.conf
+++ b/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf
diff --git a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-intel-openbmc/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
index b02709ec2..b02709ec2 100644
--- a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
+++ b/meta-intel-openbmc/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
diff --git a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-intel-openbmc/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
index 410b21b4a..410b21b4a 100644
--- a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
+++ b/meta-intel-openbmc/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend