NUC: use the common intel-corei7-64 BSP

meta-intel no longer has specific BSPs for each machine, but they
share a common BSP based on the architecture.

Change-Id: Ibbb7b8b2153103367168ea37d904ce23bc245108
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

15 files changed, 10 insertions, 11 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 8447700..8541c72 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -113,8 +113,8 @@ get_groups() {
     raspberrypi|raspberrypi2|raspberrypi3)
       PROJECT_GROUPS="rpi"
     ;;
-    nuc)
-      PROJECT_GROUPS="nuc"
+    intel-corei7-64)
+      PROJECT_GROUPS="intel"
     ;;
     nvidia-logan)
       PROJECT_GROUPS="nvidia-logan"
diff --git a/conf/bblayers.conf.nuc.sample b/conf/bblayers.conf.intel.sample
index 90998fb..df1f544 100644
--- a/conf/bblayers.conf.nuc.sample
+++ b/conf/bblayers.conf.intel.sample
@@ -31,14 +31,13 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-yocto \
   ${BSPDIR}/sources/meta-intel \
-  ${BSPDIR}/sources/meta-intel/meta-nuc \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-intel-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/distro/include/nuc.conf b/conf/distro/include/intel-corei7-64.conf
index 8a41388..8a41388 100644
--- a/conf/distro/include/nuc.conf
+++ b/conf/distro/include/intel-corei7-64.conf
diff --git a/meta-nuc-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
index 7bbff62..7bbff62 100644
--- a/meta-nuc-extras/classes/image_dd_efi.bbclass
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
diff --git a/meta-nuc-extras/conf/layer.conf b/meta-intel-extras/conf/layer.conf
index f0cb66f..3b7be9d 100644
--- a/meta-nuc-extras/conf/layer.conf
+++ b/meta-intel-extras/conf/layer.conf
@@ -27,6 +27,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
             ${LAYERDIR}/recipes*/*/*.bbappend \
             "
 
-BBFILE_COLLECTIONS += "b2qt_nuc"
-BBFILE_PATTERN_b2qt_nuc := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_nuc = "20"
+BBFILE_COLLECTIONS += "b2qt_intel"
+BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_intel = "20"
diff --git a/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
index ca53537..ca53537 100644
--- a/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg
+++ b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
diff --git a/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
index d002240..d002240 100644
--- a/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend
+++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
diff --git a/meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg b/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
index 65ac248..65ac248 100644
--- a/meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
+++ b/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
diff --git a/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend b/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend
index 55ac1a2..55ac1a2 100644
--- a/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend
+++ b/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend
diff --git a/meta-nuc-extras/recipes/recipes-qt/qtbase_git.bbappend b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend
index 2346521..2346521 100644
--- a/meta-nuc-extras/recipes/recipes-qt/qtbase_git.bbappend
+++ b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend
diff --git a/recipes-qt/qt5/qtbase/nuc/oe-device-extra.pri b/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
index cdb6204..cdb6204 100644
--- a/recipes-qt/qt5/qtbase/nuc/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
diff --git a/recipes/adbd/files/nuc/defaults b/recipes/adbd/files/intel-corei7-64/defaults
index 0fbba4c..0fbba4c 100644
--- a/recipes/adbd/files/nuc/defaults
+++ b/recipes/adbd/files/intel-corei7-64/defaults
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 7af1380..30ff5e7 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -72,7 +72,7 @@
            remote="intel"
            revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9"
            path="sources/meta-intel"
-           groups="notdefault,nuc"/>
+           groups="notdefault,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
index 3503552..95ed55e 100644
--- a/scripts/manifest_jethro.xml
+++ b/scripts/manifest_jethro.xml
@@ -72,7 +72,7 @@
            remote="intel"
            revision="jethro"
            path="sources/meta-intel"
-           groups="notdefault,nuc"/>
+           groups="notdefault,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 0ddd4b8..9e8c4d1 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -69,8 +69,8 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
-    nuc)
-      LAYERSCONF="bblayers.conf.nuc.sample"
+    intel-corei7-64)
+      LAYERSCONF="bblayers.conf.intel.sample"
     ;;
     nvidia-logan|tegra-x1|tegra-t18x)
       LAYERSCONF="bblayers.conf.nvidia.sample"