Added support for DC3217IYE (nuc) device.

Removed imx6 specific wayland configurations from packagegroup-b2qt-embedded-toolchain-target.bb to imx6.inc.

Change-Id: I2b700b21bbf23fbaf59dcb8558b0b96b11bb81ec
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>

15 files changed, 119 insertions, 7 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index a367d31..9c67a64 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -111,6 +111,9 @@ get_groups() {
     raspberrypi|raspberrypi2)
       PROJECT_GROUPS="rpi"
     ;;
+    nuc)
+      PROJECT_GROUPS="nuc"
+    ;;
     emulator)
       PROJECT_GROUPS="emulator"
     ;;
diff --git a/conf/bblayers.conf.nuc.sample b/conf/bblayers.conf.nuc.sample
new file mode 100644
index 0000000..9a57e81
--- /dev/null
+++ b/conf/bblayers.conf.nuc.sample
@@ -0,0 +1,47 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+
+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-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-b2qt \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  "
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 2ceb4fe..119161e 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -43,7 +43,7 @@ MACHINE_EXTRA_INSTALL = "\
         ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index fcf716a..6b8399a 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -42,7 +42,7 @@ MACHINE_EXTRA_INSTALL = "\
         ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index 5cb3814..4b4f280 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -1,2 +1,7 @@
 BBMASK ?= " "
 BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
+        "
+
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index c677500..82c98a4 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -47,7 +47,7 @@ MACHINE_EXTRA_INSTALL = "\
         libopencv-objdetect \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 0b41513..0abf640 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -60,7 +60,7 @@ MACHINE_EXTRA_INSTALL = "\
         libopencv-objdetect \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/nuc.conf b/conf/distro/include/nuc.conf
new file mode 100644
index 0000000..ad2a097
--- /dev/null
+++ b/conf/distro/include/nuc.conf
@@ -0,0 +1,37 @@
+#############################################################################
+##
+## Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DISTRO_FEATURES_DEFAULT += "wayland weston"
+
+DISTRO_FEATURES_remove = "usbgadget"
+
+IMAGE_FSTYPES += " hddimg"
+
+MACHINE_EXTRA_INSTALL = "\
+        wayland \
+        mesa-megadriver \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        mesa-dev \
+        "
+
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 8e69ac8..ff8bdd5 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -35,7 +35,7 @@ MACHINE_EXTRA_INSTALL = "\
         kernel-devicetree \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index cec9fd5..b50338d 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -38,7 +38,7 @@ MACHINE_EXTRA_INSTALL = "\
         ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/recipes/adbd/files/nuc/defaults b/recipes/adbd/files/nuc/defaults
new file mode 100644
index 0000000..9b7edf5
--- /dev/null
+++ b/recipes/adbd/files/nuc/defaults
@@ -0,0 +1,5 @@
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+USE_ETHERNET=yes
+HOME=/data
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
index 59fa843..9aad8df 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -51,7 +51,7 @@ RDEPENDS_${PN} += "\
     atk-dev \
     libevent-dev \
     ostree-dev \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
     ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \
     ${MACHINE_EXTRA_INSTALL_SDK} \
     "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 8471c30..5f0c16c 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -10,6 +10,7 @@
   <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/architech-boards" name="architech"/>
   <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
+  <remote fetch="git://git.yoctoproject.org" name="intel"/>
 
   <project name="poky"
            remote="yocto"
@@ -59,6 +60,11 @@
            revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
            path="sources/meta-tibidabo"
            groups="notdefault,architech"/>
+  <project name="meta-intel"
+           remote="intel"
+           revision="ead0a5c115e632015d8358f4f304ec8908732f5f"
+           path="sources/meta-intel"
+           groups="notdefault,nuc"/>
 
 </manifest>
 
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml
index f146b2b..720d7d1 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_fido.xml
@@ -10,6 +10,7 @@
   <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/architech-boards" name="architech"/>
   <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
+  <remote fetch="git://git.yoctoproject.org" name="intel"/>
 
   <project name="poky"
            remote="yocto"
@@ -59,6 +60,11 @@
            revision="dora"
            path="sources/meta-tibidabo"
            groups="notdefault,architech"/>
+  <project name="meta-intel"
+           remote="intel"
+           revision="fido"
+           path="sources/meta-intel"
+           groups="notdefault,nuc"/>
 
 </manifest>
 
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 683f19f..da7ec69 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -67,6 +67,9 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     raspberrypi|raspberrypi2)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
+    nuc)
+      LAYERSCONF="bblayers.conf.nuc.sample"
+    ;;
     emulator)
       LAYERSCONF="bblayers.conf.emulator.sample"
     ;;