[PATCHv4 1/8] xf86-video-intel: Bring 2.20.0 version to match released graphics stack

[PATCHv4 1/8] xf86-video-intel: Bring 2.20.0 version to match released graphics stack

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

The Intel Linux graphics stack version 12.07 released on 2012-07-24
requires version 2.20.0 as seen here:
   http://intellinuxgraphics.org/2012.07.html

Currently oecore has 2.19.0 version. So get this 2.20.0 version in
meta-intel layer to be used by sugarbay and other BSPs using the
Intel graphics stack.

Also took changes from version 2.20.8 recipe from Ross Burton's branch.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../xorg-driver/xf86-video-intel_2.20.0.bb         |   27 ++++++++++++++++
 .../xorg-driver/xorg-driver-common.inc             |   33 ++++++++++++++++++++
 .../xorg-driver/xorg-driver-video.inc              |    4 ++
 3 files changed, 64 insertions(+), 0 deletions(-)
 create mode 100644 common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-common.inc
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-video.inc

diff --git a/common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb b/common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb
new file mode 100644
index 0000000..6cfca03
--- /dev/null
+++ b/common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb
@@ -0,0 +1,27 @@
+require xorg-driver-video.inc
+
+SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
+
+DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \
+chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
+the driver supports hardware accelerated 3D via the Direct Rendering \
+Infrastructure (DRI)."
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
+
+PR = "${INC_PR}.0"
+
+DEPENDS += "virtual/libx11 drm xf86driproto glproto \
+	    virtual/libgl xineramaproto xf86driproto libpciaccess"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
+PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
+
+# --enable-kms-only option is required by ROOTLESS_X
+EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}'
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+SRC_URI[md5sum] = "070bb866b05a16366bd9bb844c9b91aa"
+SRC_URI[sha256sum] = "21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783"
diff --git a/common/recipes-graphics/xorg-driver/xorg-driver-common.inc b/common/recipes-graphics/xorg-driver/xorg-driver-common.inc
new file mode 100644
index 0000000..1ed2742
--- /dev/null
+++ b/common/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -0,0 +1,33 @@
+DESCRIPTION = "X driver"
+HOMEPAGE = "http://www.x.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11/drivers"
+LICENSE = "MIT-X"
+
+PE = "2"
+INC_PR = "r0"
+
+DEPENDS = "virtual/xserver xproto randrproto util-macros"
+
+SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${BPN}-${PV}"
+
+FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
+
+inherit autotools pkgconfig
+
+# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
+# macro that simply assumes the test succeeds. 
+do_configure_prepend () {
+    echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new
+    sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new
+    mv configure.ac.new configure.ac
+}
+
+# FIXME: We don't want to include the libtool archives (*.la) from modules
+# directory, as they serve no useful purpose. Upstream should fix Makefile.am
+do_install_append() {
+	find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
+}
diff --git a/common/recipes-graphics/xorg-driver/xorg-driver-video.inc b/common/recipes-graphics/xorg-driver/xorg-driver-video.inc
new file mode 100644
index 0000000..57c80d1
--- /dev/null
+++ b/common/recipes-graphics/xorg-driver/xorg-driver-video.inc
@@ -0,0 +1,4 @@
+include xorg-driver-common.inc
+
+DEPENDS =+ "renderproto videoproto xextproto fontsproto"
+
-- 
1.7.3.4

[PATCHv4 2/8] crownbay.conf: specify the 8.0.4 version as preferred version of mesa-dri

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Avoid following warnings while building crownbay BSPs:

 NOTE: preferred version 7.11 of mesa-dri not available (for item virtual/libgl)
 NOTE: versions of mesa-dri available: 2:8.0.4 2:8.0.4+git1+c1f4867c89adb1a6b19d66ec8ad146115909f0a7

This commit addresses one of the issue reported on the bug:
[YOCTO #3238]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta-crownbay/conf/machine/crownbay.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index c18fa1d..72431de 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -18,7 +18,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
            "
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
-PREFERRED_VERSION_mesa-dri ?= "7.11"
+PREFERRED_VERSION_mesa-dri ?= "8.0.4"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 
 APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
-- 
1.7.3.4

[PATCHv4 0/8] Misc meta-intel commits

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

This v4 pull request add these extra  commits compared to v3
  mesa-dri.bbappend: avoid conflict with emgd-driver-bin
  emgd-driver-bin: note all the EMGD licenses
  custom-licenses dir for emgd recipe Licenses

Thanks,
Nitin

The following changes since commit 5d8a05811101f7d69994f4028ec620c4480f6da4:

  Fix use of PRINC in meta-intel BSPs (2012-10-09 16:04:30 -0700)

are available in the git repository at:
  git://git.yoctoproject.org/meta-intel-contrib nitin/misc
  http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc

Nitin A Kamble (8):
  xf86-video-intel: Bring 2.20.0 version to match released graphics
    stack
  crownbay.conf: specify the 8.0.4 version as preferred version of
    mesa-dri
  emgd-driver_bin_1.10: Remove in favor of 1.14
  fishriver BSP retirement
  update maintainers of various BSPs
  mesa-dri.bbappend: avoid conflict with emgd-driver-bin
  emgd-driver-bin: note all the EMGD licenses
  custom-licenses dir for emgd recipe Licenses

 MAINTAINERS                                        |   16 +-
 .../Intel-software-license-emgd-1.14               |   42 ++
 ...-space-graphics-driver-binary-license-emgd-1.14 |  559 ++++++++++++++++++++
 .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   24 +
 .../xorg-driver/emgd-driver-bin_1.10.bb            |   93 ----
 .../xorg-driver/emgd-driver-bin_1.14.bb            |    5 +-
 .../xorg-driver/xf86-video-intel_2.20.0.bb         |   27 +
 .../xorg-driver/xorg-driver-common.inc             |   33 ++
 .../xorg-driver/xorg-driver-video.inc              |    4 +
 conf/layer.conf                                    |    3 +
 meta-chiefriver/README                             |   11 +
 meta-crownbay/README                               |    2 +-
 meta-crownbay/conf/machine/crownbay.conf           |    2 +-
 meta-emenlow/README                                |    2 +-
 meta-fishriver/COPYING.MIT                         |   17 -
 meta-fishriver/README                              |  114 ----
 meta-fishriver/README.sources                      |   17 -
 meta-fishriver/conf/layer.conf                     |   12 -
 meta-fishriver/conf/machine/fishriver.conf         |   17 -
 .../formfactor/formfactor/fishriver/machconfig     |    3 -
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    3 -
 .../xserver-xf86-config/fishriver/xorg.conf        |   26 -
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
 .../linux/linux-yocto-rt_3.0.bbappend              |    8 -
 .../linux/linux-yocto-rt_3.2.bbappend              |    8 -
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 -
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 -
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    8 -
 meta-jasperforest/README                           |    2 +-
 meta-sugarbay/README                               |    2 +-
 30 files changed, 717 insertions(+), 361 deletions(-)
 create mode 100644 common/custom-licenses/Intel-software-license-emgd-1.14
 create mode 100644 common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14
 create mode 100644 common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
 delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb
 create mode 100644 common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-common.inc
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-video.inc
 delete mode 100644 meta-fishriver/COPYING.MIT
 delete mode 100644 meta-fishriver/README
 delete mode 100644 meta-fishriver/README.sources
 delete mode 100644 meta-fishriver/binary/.gitignore
 delete mode 100644 meta-fishriver/conf/layer.conf
 delete mode 100644 meta-fishriver/conf/machine/fishriver.conf
 delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig
 delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
 delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf
 delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend

-- 
1.7.3.4

[PATCHv4 3/8] emgd-driver_bin_1.10: Remove in favor of 1.14

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

All BSPs have been migrated to 1.14, we can now safely retire 1.10

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../xorg-driver/emgd-driver-bin_1.10.bb            |   93 --------------------
 1 files changed, 0 insertions(+), 93 deletions(-)
 delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb

diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb
deleted file mode 100644
index 6d80bee..0000000
--- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb
+++ /dev/null
@@ -1,93 +0,0 @@
-SUMMARY = "EMGD 1.10 xserver binaries"
-DESCRIPTION = "EMGD 1.10 includes some userspace binaries that use non-free \
-licensing, which are now available via a non-click-through downloadable \
-tarball, and is what this recipe now uses.  Since it is a non-free license, \
-this recipe is marked as 'License_emgd-driver-bin_1.10' and you need to add \
-to LICENSE_FLAGS_WHITELIST += \"License_emgd-driver-bin_1.10\" to your \
-local.conf in order to enable it in a build."
-LICENSE = "Intel-binary-only"
-LICENSE_FLAGS = "license_${PN}_${PV}"
-PR = "r1"
-
-EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
-EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
-EMGD_VIDEO_PLUGIN_DIR = "../common/video_plugin"
-
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
-
-DEPENDS = "rpm-native xz-native"
-
-SRC_URI = "https://edc.intel.com/App_Shared/Downloads/LIN_EMGD_1_10_RC_2209.tgz"
-
-SRC_URI[md5sum] = "e4a38d9efa0b086ae21b68145c4db4e9"
-SRC_URI[sha256sum] = "acea5f0f93a31553553428623c007d7ed0c604cf715fd87dfe075751da4be548"
-
-# These are closed binaries generated elsewhere so don't check ldflags
-INSANE_SKIP_${PN} = "ldflags"
-# Inhibit warnings about files being stripped, we can't do anything about it.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-FILES_${PN} += "${libdir}/dri ${libdir}/gstreamer-0.10 ${libdir}/xorg/modules/drivers"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
-
-S = "${WORKDIR}/${EMGD_RPM_DIR}"
-
-do_install () {
-    # A gstreamer VA buffer library
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-vabuffer*.rpm | cpio -id
-
-    # MIX Common contains common classes, datatype, header files used by other MIX components
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/mixcommon*.rpm | cpio -id
-
-    # MIX Video Bitstream Parser is an user library interface for various video format bitstream parsing
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/mixvbp*.rpm | cpio -id
-
-    # MIX Video is an user library interface for various video codecs available on the platform.
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/mixvideo*.rpm | cpio -id
-
-    install -d -m 0755                                    ${D}${libdir}/gstreamer-0.10
-    install -m 0755 ${S}/usr/lib/*                        ${D}${libdir}/
-
-    # A gstreamer plugin that uses MIX Video for hardware accelerated video decoding and rendering.
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-plugins-mixvideo*.rpm | cpio -id
-
-    # A collection of gstreamer plugins that uses VA libraries for hardware accelerated video rendering and text overlay.
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-plugins-va*.rpm | cpio -id
-
-    install -m 0755 ${S}/usr/lib/gstreamer-0.10/*         ${D}${libdir}/gstreamer-0.10/
-
-    # EMGD runtime graphics libraries
-    rpm2cpio ${S}/emgd-bin*.rpm | xz -d | cpio -id
-
-    install -d -m 0755                                    ${D}${libdir}/dri
-    install -d -m 0755                                    ${D}${libdir}/xorg/modules/drivers
-    install -d -m 0755                                    ${D}${sysconfdir}
-    install -d -m 0755                                    ${D}${mandir}/man4
-    install -m 0755 ${S}/usr/lib/*.so.*                   ${D}${libdir}/
-    install -m 0755 ${S}/usr/lib/dri/*                    ${D}${libdir}/dri/
-    install -m 0755 ${S}/usr/lib/xorg/modules/drivers/*   ${D}${libdir}/xorg/modules/drivers/
-    install -m 0755 ${S}/etc/*                            ${D}${sysconfdir}/
-    install -m 0755 ${S}/usr/share/man/man4/*             ${D}${mandir}/man4/
-
-    # Khronos development headers needed for EGL, OpenGL-ES, and OpenVG development
-    rpm2cpio ${S}/emgd-devel*.rpm | xz -d | cpio -id
-
-    install -d -m 0755                                    ${D}${includedir}/EGL
-    install -m 0755 ${S}/usr/include/EGL/*.h              ${D}${includedir}/EGL/
-    install -d -m 0755                                    ${D}${includedir}/GLES
-    install -m 0755 ${S}/usr/include/GLES/*.h             ${D}${includedir}/GLES/
-    install -d -m 0755                                    ${D}${includedir}/GLES2
-    install -m 0755 ${S}/usr/include/GLES2/*.h            ${D}${includedir}/GLES2/
-    install -d -m 0755                                    ${D}${includedir}/KHR
-    install -m 0755 ${S}/usr/include/KHR/*.h              ${D}${includedir}/KHR/
-    install -d -m 0755                                    ${D}${includedir}/VG
-    install -m 0755 ${S}/usr/include/VG/*.h               ${D}${includedir}/VG/
-
-    ln -sf libEGL.so.1                                    ${D}${libdir}/libEGL.so
-    ln -sf libGLES_CM.so.1                                ${D}${libdir}/libGLES_CM.so
-    ln -sf libGLESv2.so.2                                 ${D}${libdir}/libGLESv2.so
-    ln -sf libOpenVG.so.1                                 ${D}${libdir}/libOpenVG.so
-    ln -sf libOpenVGU.so.1                                ${D}${libdir}/libOpenVGU.so
-}
-
-LEAD_SONAME = "libEGL.so"
-- 
1.7.3.4

[PATCHv4 4/8] fishriver BSP retirement

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

This commit removes fishriver bsp from meta-intel layer.

  Fish-River-Island-2 hardware and BSP has made this
Fish-River-Island hardware and BSP obsolete.
  Also we discussed this on the Yocto Execution Tracking Meeting,
and to our knowledge no customer is using (cares about) this BSP now.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 MAINTAINERS                                        |    4 -
 meta-fishriver/COPYING.MIT                         |   17 ---
 meta-fishriver/README                              |  114 --------------------
 meta-fishriver/README.sources                      |   17 ---
 meta-fishriver/conf/layer.conf                     |   12 --
 meta-fishriver/conf/machine/fishriver.conf         |   17 ---
 .../formfactor/formfactor/fishriver/machconfig     |    3 -
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    3 -
 .../xserver-xf86-config/fishriver/xorg.conf        |   26 -----
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
 .../linux/linux-yocto-rt_3.0.bbappend              |    8 --
 .../linux/linux-yocto-rt_3.2.bbappend              |    8 --
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 --
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 --
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    8 --
 15 files changed, 0 insertions(+), 255 deletions(-)
 delete mode 100644 meta-fishriver/COPYING.MIT
 delete mode 100644 meta-fishriver/README
 delete mode 100644 meta-fishriver/README.sources
 delete mode 100644 meta-fishriver/binary/.gitignore
 delete mode 100644 meta-fishriver/conf/layer.conf
 delete mode 100644 meta-fishriver/conf/machine/fishriver.conf
 delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig
 delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
 delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf
 delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend

diff --git a/MAINTAINERS b/MAINTAINERS
index 5bcf470..3bf0add 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -56,10 +56,6 @@ EMENLOW
 M:	Tom Zanussi <tom.zanussi@intel.com>
 F:	meta-emenlow/
 
-FISHRIVER
-M:	Tom Zanussi <tom.zanussi@intel.com>
-F:	meta-fishriver/
-
 FRI2
 M:	Darren Hart <dvhart@linux.intel.com>
 F:	meta-fri2/
diff --git a/meta-fishriver/COPYING.MIT b/meta-fishriver/COPYING.MIT
deleted file mode 100644
index fb950dc..0000000
--- a/meta-fishriver/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
diff --git a/meta-fishriver/README b/meta-fishriver/README
deleted file mode 100644
index 1dd0a4c..0000000
--- a/meta-fishriver/README
+++ /dev/null
@@ -1,114 +0,0 @@
-This README file contains information on building the meta-fishriver
-BSP layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-
-
-Dependencies
-============
-
-This layer depends on:
-
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-
-
-Patches
-=======
-
-Please submit any patches against this BSP to the Yocto mailing list
-(yocto@yoctoproject.org) and cc: the maintainer:
-
-Maintainer: Tom Zanussi <tom.zanussi@intel.com>
-
-Please see the meta-intel/MAINTAINERS file for more details.
-
-
-Table of Contents
-=================
-
-  I. Building the meta-fishriver BSP layer
- II. Booting the images in /binary
-
-
-I. Building the meta-fishriver BSP layer
-========================================
-
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board Support
-Package (BSP) Downloads' page of the Yocto Project website.
-
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a fishriver
-image by adding the location of the meta-fishriver layer to
-bblayers.conf, along with the meta-intel layer itself (to access
-common metadata shared between BSPs) e.g.:
-
-  yocto/meta-intel \
-  yocto/meta-intel/meta-fishriver \
-
-To enable the fishriver layer, add the fishriver MACHINE to local.conf:
-
-  MACHINE ?= "fishriver"
-
-You should then be able to build a fishriver image as such:
-
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-
-At the end of a successful build, you should have a live image that
-you can boot from a USB flash drive (see instructions on how to do
-that below, in the section 'Booting the images from /binary').
-
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90), in
-addition to the latest code which tracks the current master (note that
-not all BSPs are present in every release).  Instead of extracting a
-BSP tarball at the top level of your yocto build tree, you can
-equivalently check out the appropriate branch from the meta-intel
-repository at the same location.
-
-
-II. Booting the images in /binary
-=================================
-
-This BSP contains bootable live images, which can be used to directly
-boot Yocto off of a USB flash drive.
-
-Under Linux, insert a USB flash drive.  Assuming the USB flash drive
-takes device /dev/sdf, use dd to copy the live image to it.  For
-example:
-
-# dd if=core-image-sato-fishriver-20101207053738.hddimg of=/dev/sdf
-# sync
-# eject /dev/sdf
-
-This should give you a bootable USB flash device.  Insert the device
-into a bootable USB socket on the target, and power on.  This should
-result in a system booted to the Sato graphical desktop.
-
-If you want a terminal, use the arrows at the top of the UI to move to
-different pages of available applications, one of which is named
-'Terminal'.  Clicking that should give you a root terminal.
-
-If you want to ssh into the system, you can use the root terminal to
-ifconfig the IP address and use that to ssh in.  The root password is
-empty, so to log in type 'root' for the user name and hit 'Enter' at
-the Password prompt: and you should be in.
-
-----
-
-If you find you're getting corrupt images on the USB (it doesn't show
-the syslinux boot: prompt, or the boot: prompt contains strange
-characters), try doing this first:
-
-# dd if=/dev/zero of=/dev/sdf bs=1M count=512
diff --git a/meta-fishriver/README.sources b/meta-fishriver/README.sources
deleted file mode 100644
index 76180f1..0000000
--- a/meta-fishriver/README.sources
+++ /dev/null
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-
-http://downloads.yoctoproject.org/mirror/sources/
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-
-http://www.yoctoproject.org/downloads/yocto-1.2/poky-denzil-7.0.tar.bz2
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
diff --git a/meta-fishriver/binary/.gitignore b/meta-fishriver/binary/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/meta-fishriver/conf/layer.conf b/meta-fishriver/conf/layer.conf
deleted file mode 100644
index 61e292b..0000000
--- a/meta-fishriver/conf/layer.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}:${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "fishriver"
-BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
-BBFILE_PRIORITY_fishriver = "6"
-
-LAYERDEPENDS_fishriver = "intel"
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
deleted file mode 100644
index ec2e87f..0000000
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: fishriver
-
-#@DESCRIPTION: Machine configuration for Fish River Island systems
-# i.e. Z530/E660 + EG20T
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-
-require conf/machine/include/tune-atom.inc
-require conf/machine/include/ia32-base.inc
-
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
-           "
-
-APPEND += "video=vesafb vga=0x318"
diff --git a/meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig b/meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig
deleted file mode 100644
index ffce012..0000000
--- a/meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
diff --git a/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 6644a84..0000000
--- a/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf b/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf
deleted file mode 100644
index da4fc3c..0000000
--- a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-Section "Device"
-    Identifier	"Generic VESA"
-    Driver	"vesa"
-EndSection
-
-Section "Monitor"
-    Identifier    "Generic Monitor"
-    Option        "DPMS"
-EndSection
-
-Section "Screen"
-    Identifier    "Default Screen"
-    Device	  "Generic VESA"
-    Monitor       "Generic Monitor"
-    DefaultDepth  24
-EndSection
-
-Section "ServerLayout"
-    Identifier     "Default Layout"
-    Screen         "Default Screen"
-EndSection
-
-Section "ServerFlags"
-    Option        "DontZap"  "0"
-    Option        "AutoAddDevices"  "False"
-EndSection
diff --git a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
deleted file mode 100644
index 7a502bd..0000000
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
deleted file mode 100644
index a91a425..0000000
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
deleted file mode 100644
index 6ac6ef5..0000000
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "yocto/standard/fishriver"
-KERNEL_FEATURES_append_fishriver += " cfg/smp.scc"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "c139592c96722727a9f074515a4061c3820da1a6"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
deleted file mode 100644
index 9a2f678..0000000
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/default/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "969edd015a46eed77d6c3daeffdc299dd06e3397"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "5b4c9dc78b5ae607173cc3ddab9bce1b5f78129b"
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
deleted file mode 100644
index c0d04dc..0000000
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "5bdc655034a58a7147176a8a882d81e2fd51e4b9"
-- 
1.7.3.4

[PATCHv4 5/8] update maintainers of various BSPs

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

BSP maintainership for following BSPs is now transitioned from Tom to Nitin
 sugarbay, emenlow, crownbay, jasperforest, chiefriver

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 MAINTAINERS              |   12 ++++++------
 meta-chiefriver/README   |   11 +++++++++++
 meta-crownbay/README     |    2 +-
 meta-emenlow/README      |    2 +-
 meta-jasperforest/README |    2 +-
 meta-sugarbay/README     |    2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 3bf0add..d63ed31 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -37,15 +37,15 @@ M:      Kishore Bodke <kishore.k.bodke@intel.com>
 F:      meta-cedartrail/
 
 CHIEFRIVER
-M:	Tom Zanussi <tom.zanussi@intel.com>
+M:	Nitin A Kamble<nitin.a.kamble@intel.com>
 F:	meta-chiefriver/
 
 COMMON
-M:	Tom Zanussi <tom.zanussi@intel.com>
+M:	Nitin A Kamble<nitin.a.kamble@intel.com>
 F:	common/recipes-core/
 
 CROWNBAY
-M:	Tom Zanussi <tom.zanussi@intel.com>
+M:	Nitin A Kamble<nitin.a.kamble@intel.com>
 F:	meta-crownbay/
 
 CRYSTALFOREST
@@ -53,7 +53,7 @@ M:      Kishore Bodke <kishore.k.bodke@intel.com>
 F:      meta-crystalforest/
 
 EMENLOW
-M:	Tom Zanussi <tom.zanussi@intel.com>
+M:	Nitin A Kamble<nitin.a.kamble@intel.com>
 F:	meta-emenlow/
 
 FRI2
@@ -61,7 +61,7 @@ M:	Darren Hart <dvhart@linux.intel.com>
 F:	meta-fri2/
 
 JASPERFOREST
-M:	Tom Zanussi <tom.zanussi@intel.com>
+M:	Nitin A Kamble<nitin.a.kamble@intel.com>
 F:	meta-jasperforest/
 
 N450
@@ -73,6 +73,6 @@ M:      Kishore Bodke <kishore.k.bodke@intel.com>
 F:      meta-romley/
 
 SUGARBAY
-M:	Tom Zanussi <tom.zanussi@intel.com>
+M:	Nitin A Kamble<nitin.a.kamble@intel.com>
 F:	meta-sugarbay/
 
diff --git a/meta-chiefriver/README b/meta-chiefriver/README
index 438c293..7c47b02 100644
--- a/meta-chiefriver/README
+++ b/meta-chiefriver/README
@@ -24,6 +24,17 @@ This layer depends on:
   branch: master
 
 
+Patches
+=======
+
+Please submit any patches against this BSP to the Yocto mailing list
+(yocto@yoctoproject.org) and cc: the maintainer:
+
+Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
+
+Please see the meta-intel/MAINTAINERS file for more details.
+
+
 Table of Contents
 =================
 
diff --git a/meta-crownbay/README b/meta-crownbay/README
index f7aeffa..4bc9f31 100644
--- a/meta-crownbay/README
+++ b/meta-crownbay/README
@@ -32,7 +32,7 @@ Patches
 Please submit any patches against this BSP to the Yocto mailing list
 (yocto@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Tom Zanussi <tom.zanussi@intel.com>
+Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.
 
diff --git a/meta-emenlow/README b/meta-emenlow/README
index 9bef671..3932718 100644
--- a/meta-emenlow/README
+++ b/meta-emenlow/README
@@ -36,7 +36,7 @@ Patches
 Please submit any patches against this BSP to the Yocto mailing list
 (yocto@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Tom Zanussi <tom.zanussi@intel.com>
+Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.
 
diff --git a/meta-jasperforest/README b/meta-jasperforest/README
index 78852bd..12f84c2 100644
--- a/meta-jasperforest/README
+++ b/meta-jasperforest/README
@@ -31,7 +31,7 @@ Patches
 Please submit any patches against this BSP to the Yocto mailing list
 (yocto@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Tom Zanussi <tom.zanussi@intel.com>
+Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.
 
diff --git a/meta-sugarbay/README b/meta-sugarbay/README
index 80833c1..c8a99d7 100644
--- a/meta-sugarbay/README
+++ b/meta-sugarbay/README
@@ -30,7 +30,7 @@ Patches
 Please submit any patches against this BSP to the Yocto mailing list
 (yocto@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Tom Zanussi <tom.zanussi@intel.com>
+Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.
 
-- 
1.7.3.4

[PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Extend the mesa-dri recipe from oecore to avoid conflict with
files generated by emgd-driver-bin recipe.

This extention is needed only when emgd-driver-bin recipe is
included in the target image, so the code is conditional to
run only on the machine with emgd graphics driver.

The emgd binary driver also provides egl, gles1, gles2 library & headers.
To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image
is bundling the emgd driver.

This commits avoids these build warning

WARNING: The recipe is trying to install files into a shared area when those files already exist. Those files are:
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/KHR/khrplatform.h
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglplatform.h
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglext.h
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/egl.h
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glplatform.h
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/gl.h
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glext.h
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2ext.h
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2.h
   /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2platform.h

This resolves part of the issue reported on the bug:
[Yocto #3238]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   24 ++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend

diff --git a/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
new file mode 100644
index 0000000..6bfa968
--- /dev/null
+++ b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
@@ -0,0 +1,24 @@
+
+# The emgd binary driver also provides egl, gles1, gles2 library & headers.
+# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image
+# is bundling the emgd driver.
+
+python __anonymous () {
+    import re
+    xserver = d.getVar('XSERVER', True)
+    if 'emgd-driver-bin' in xserver.split(' '):
+        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
+	take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
+	put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
+        pattern = re.compile("--with-egl-platforms")
+        new_extra_oeconf = [ ]
+	for i in extra_oeconf:
+            if ( i not in take_out ) and ( not pattern.match(i)):
+                new_extra_oeconf.append(i)
+        for i in put_in:
+            new_extra_oeconf.append(i)
+
+        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
+        depends = d.getVar('DEPENDS', True)
+        d.setVar('DEPENDS', depends + " emgd-driver-bin")
+}
-- 
1.7.3.4

[PATCHv4 7/8] emgd-driver-bin: note all the EMGD licenses

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

There are two files containing the custom license data for EMGD:
license: which holds INTEL SOFTWARE LICENSE AGREEMENT
readme.txt: which holds User Space Graphics Driver Binary License

checksum both these files to track any license changes in future.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../xorg-driver/emgd-driver-bin_1.14.bb            |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
index 1f585f2..ddf874e 100644
--- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
+++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
@@ -5,7 +5,7 @@ tarball, and is what this recipe now uses.  Since it is a non-free license, \
 this recipe is marked as 'License_emgd-driver-bin_1.14' and you need to add \
 to LICENSE_FLAGS_WHITELIST += \"License_emgd-driver-bin_1.14\" to your \
 local.conf in order to enable it in a build."
-LICENSE = "Intel-binary-only"
+LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14"
 LICENSE_FLAGS = "license_${PN}_${PV}"
 PR = "r2"
 
@@ -13,7 +13,8 @@ EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
 EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
 EMGD_VIDEO_PLUGIN_DIR = "../common/video_plugin"
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d \
+                    file://${WORKDIR}/${EMGD_LIC_DIR}/readme.txt;md5=73cbec7a0d2bc22faf567238e055bfc8"
 
 DEPENDS = "rpm-native xz-native"
 RDEPENDS = "libxcb-dri2"
-- 
1.7.3.4

[PATCHv4 8/8] custom-licenses dir for emgd recipe Licenses

[nitin.a.kamble]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 37294 bytes --]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Add a directory common/custom-licenses to store license texts of recipes
in meta-intel layer using custom licenses.

Adding these licenses text for emgd-driver-bin recipe:
- Intel-software-license-emgd-1.14
- Intel-user-space-graphics-driver-binary-license-emgd-1.14

This takes care of this build warning:
WARNING: emgd-driver-bin: No generic license file exists for: Intel-binary-only in any provider

This addresses one of the issue reported in the bug:
[YOCTO #3238]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../Intel-software-license-emgd-1.14               |   42 ++
 ...-space-graphics-driver-binary-license-emgd-1.14 |  559 ++++++++++++++++++++
 conf/layer.conf                                    |    3 +
 3 files changed, 604 insertions(+), 0 deletions(-)
 create mode 100644 common/custom-licenses/Intel-software-license-emgd-1.14
 create mode 100644 common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14

diff --git a/common/custom-licenses/Intel-software-license-emgd-1.14 b/common/custom-licenses/Intel-software-license-emgd-1.14
new file mode 100644
index 0000000..5a39c93
--- /dev/null
+++ b/common/custom-licenses/Intel-software-license-emgd-1.14
@@ -0,0 +1,42 @@
+INTEL SOFTWARE LICENSE AGREEMENT 
+
+IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING.
+
+Do not use or load this software and any associated materials (collectively, the "Software") until you have carefully read the following terms and conditions.  By loading or using the Software, you agree to the terms of this Agreement.  If you do not wish to so agree, do not install or use the Software.
+
+* The Linux DRM kernel source code, when included with this Software, is not subject to the terms of this Agreement but is subject to the “GNU General Public License Version 2”, which may be obtained at the following web site: http://www.gnu.org/licenses/gpl.txt
+
+* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. (copyright may need to be changed)
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining copy of this software and 
+* associated documentation files (the "Software"), to deal in the Software without restriction, including 
+* without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+* copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to 
+* the following conditions:
+*
+* The above copyright notice and this permission notice (including the next paragraph) shall be included 
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+*  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+* IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS 
+* SUPPLIERS BE LIABLE FOR ANY 
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
+* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH 
+* THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Copyright (c) 2011, Intel Corporation.
+All rights reserved.
+
+Redistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met:
+
+• Redistributions must reproduce the above copyright notice and the following disclaimer in the   documentation and/or other materials provided with the distribution.
+• Neither the name of Intel Corporation nor the names of its suppliers may be used to endorse or promote products derived from this software without specific prior written permission.
+• No reverse engineering, decompilation, or disassembly of this software is permitted.
+• “Binary form” includes any format commonly used for electronic conveyance which is a reversible, bit-exact translation of binary representation to ASCII or ISO text, for example, “uuencode.”
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14 b/common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14
new file mode 100644
index 0000000..4f6bb6d
--- /dev/null
+++ b/common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14
@@ -0,0 +1,559 @@
+User Space Graphics Driver Binary License
+
+Copyright (c) 2008, Intel Corporation. 
+Portions (c), Imagination Technology, Ltd. 
+All rights reserved. 
+Redistribution and Use. Redistribution and use in binary form, without modification, of the software code provided with this license (“Software”), are permitted provided that the following conditions are met: 
+• Redistributions must reproduce the above copyright notice and this license in the documentation and/or other materials provided with the Software. 
+• Neither the name of Intel Corporation nor the name of Imagination Technology, Ltd may be used to endorse or promote products derived from the Software without specific prior written permission. 
+• The Software can only be used in connection with the Intel hardware designed to use the Software as outlined in the documentation. No other use is authorized. 
+• No reverse engineering, decompilation, or disassembly of the Software is permitted. 
+• The Software may not be distributed under terms different than this license. 
+
+Limited Patent License. Intel Corporation grants a world-wide, royalty-free, non-exclusive license under patents it now or hereafter owns or controls to make, have made, use, import, offer to sell and sell (“Utilize”) the Software, but solely to the extent that any such patent is necessary to Utilize the Software alone. The patent license shall not apply to any combinations which include the Software. No hardware per se is licensed hereunder. 
+Ownership of Software and Copyrights. Title to all copies of the Software remains with the copyright holders. The Software is copyrighted and protected by the laws of the United States and other countries, and international treaty provisions. 
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+/*
+* (C) Copyright IBM Corporation 2002, 2004 
+* All Rights Reserved. 
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
+* documentation files (the "Software"), to deal in the Software without restriction, including without limitation on 
+* the rights to use, copy, modify, merge, publish, distribute, sub license, and/or sell copies of the Software, and to 
+* permit persons to whom the Software is furnished to do so, subject to the following conditions: 
+*
+* The above copyright notice and this permission notice (including the next 
+* paragraph) shall be included in all copies or substantial portions of the 
+* Software. 
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL 
+* VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, 
+* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+* USE OR OTHER DEALINGS IN THE SOFTWARE. 
+*/
+ 
+* Mesa 3-D graphics library 
+* Version: 7.1 
+* 
+* Copyright (C) 1999-2007 Brian Paul All Rights Reserved. 
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a 
+* copy of this software and associated documentation files (the "Software"), 
+* to deal in the Software without restriction, including without limitation 
+* the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+* and/or sell copies of the Software, and to permit persons to whom the 
+* Software is furnished to do so, subject to the following conditions: 
+* 
+* The above copyright notice and this permission notice shall be included 
+* in all copies or substantial portions of the Software. 
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN 
+* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+*/ 
+/************************************************************************** 
+* 
+* Copyright (c) Intel Corp. 2007. 
+* All Rights Reserved. 
+* 
+* Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to 
+* develop this driver. 
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a 
+* copy of this software and associated documentation files (the 
+* "Software"), to deal in the Software without restriction, including 
+* without limitation the rights to use, copy, modify, merge, publish, 
+* distribute, sub license, and/or sell copies of the Software, and to 
+* permit persons to whom the Software is furnished to do so, subject to 
+* the following conditions: 
+* 
+* The above copyright notice and this permission notice (including the 
+* next paragraph) shall be included in all copies or substantial portions 
+* of the Software. 
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL 
+* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, 
+* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+* USE OR OTHER DEALINGS IN THE SOFTWARE. 
+* 
+**************************************************************************/ 
+
+* Copyright (c) 2006-2007 Intel Corporation 
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a 
+* copy of this software and associated documentation files (the "Software"), 
+* to deal in the Software without restriction, including without limitation 
+* the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+* and/or sell copies of the Software, and to permit persons to whom the 
+* Software is furnished to do so, subject to the following conditions: 
+* 
+* The above copyright notice and this permission notice (including the next 
+* paragraph) shall be included in all copies or substantial portions of the 
+* Software. 
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+* SOFTWARE. 
+* 
+* Authors: 
+* Eric Anholt <eric@anholt.net> 
+* Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> 
+* 
+*/ 
+/************************************************************************** 
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. 
+Copyright © 2002 David Dawes 
+All Rights Reserved. 
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the 
+"Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, 
+distribute, sub license, and/or sell copies of the Software, and to 
+permit persons to whom the Software is furnished to do so, subject to 
+the following conditions: 
+The above copyright notice and this permission notice (including the 
+next paragraph) shall be included in all copies or substantial portions 
+of the Software. 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. 
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR 
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+
+**************************************************************************/ 
+/* 
+* Authors: 
+* Keith Whitwell <keith@tungstengraphics.com> 
+* David Dawes <dawes@xfree86.org> 
+* 
+* Updated for Dual Head capabilities: 
+* Alan Hourihane <alanh@tungstengraphics.com> 
+* 
+* Add ARGB HW cursor support: 
+* Alan Hourihane <alanh@tungstengraphics.com> 
+* 
+* Poulsbo port 
+* Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> 
+*/ 
+/* 
+* XFree86 Xv DDX written by Mark Vojkovich (markv@valinux.com) 
+*/ 
+/* 
+* Copyright (c) 1998-2003 by The XFree86 Project, Inc. 
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a 
+* copy of this software and associated documentation files (the "Software"), 
+* to deal in the Software without restriction, including without limitation 
+* the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+* and/or sell copies of the Software, and to permit persons to whom the 
+* Software is furnished to do so, subject to the following conditions: 
+* 
+* The above copyright notice and this permission notice shall be included in 
+* all copies or substantial portions of the Software. 
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR 
+* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+* OTHER DEALINGS IN THE SOFTWARE. 
+* 
+* Except as contained in this notice, the name of the copyright holder(s) 
+* and author(s) shall not be used in advertising or otherwise to promote 
+* the sale, use or other dealings in this Software without prior written 
+* authorization from the copyright holder(s) and author(s). 
+*/ 
+/* 
+** Copyright (c) 2007-2009 The Khronos Group Inc. 
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a 
+** copy of this software and/or associated documentation files (the 
+** "Materials"), to deal in the Materials without restriction, including 
+** without limitation the rights to use, copy, modify, merge, publish, 
+** distribute, sublicense, and/or sell copies of the Materials, and to 
+** permit persons to whom the Materials are furnished to do so, subject to 
+** the following conditions:  
+
+** The above copyright notice and this permission notice shall be included 
+** in all copies or substantial portions of the Materials. 
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. 
+*/ 
+/* 
+** License Applicability. Except to the extent portions of this file are 
+** made subject to an alternative license as permitted in the SGI Free 
+** Software License B, Version 1.0 (the "License"), the contents of this 
+** file are subject only to the provisions of the License. You may not use 
+** this file except in compliance with the License. You may obtain a copy 
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: 
+** 
+** http://oss.sgi.com/projects/FreeB 
+** 
+** Note that, as provided in the License, the Software is distributed on an 
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS 
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND 
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A 
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. 
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation, 
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, 
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. 
+** Copyright in any portions created by third parties is as indicated 
+** elsewhere herein. All Rights Reserved. 
+** 
+** Additional Notice Provisions: The application programming interfaces 
+** established by SGI in conjunction with the Original Code are The 
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released 
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version 
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X 
+** Window System(R) (Version 1.3), released October 19, 1998. This software 
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation 
+** published by SGI, but has not been independently verified as being 
+** compliant with the OpenGL(R) version 1.2.1 Specification. 
+*/ 
+/* 
+* This document is licensed under the SGI Free Software B License Version 
+* 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . 
+*/ 
+/* 
+** License Applicability. Except to the extent portions of this file are 
+** made subject to an alternative license as permitted in the SGI Free 
+** Software License B, Version 1.0 (the "License"), the contents of this 
+** file are subject only to the provisions of the License. You may not use 
+** this file except in compliance with the License. You may obtain a copy 
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: 
+** 
+** http://oss.sgi.com/projects/FreeB 
+** 
+** Note that, as provided in the License, the Software is distributed on an 
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS 
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND 
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A 
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. 
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation, 
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, 
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. 
+** Copyright in any portions created by third parties is as indicated 
+** elsewhere herein. All Rights Reserved. 
+** 
+** Additional Notice Provisions: The application programming interfaces 
+** established by SGI in conjunction with the Original Code are The 
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released 
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version 
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X 
+** Window System(R) (Version 1.3), released October 19, 1998. This software 
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation 
+** published by SGI, but has not been independently verified as being 
+** compliant with the OpenGL(R) version 1.2.1 Specification. 
+*/ 
+/* 
+* This file contains code derived from files originally published under the 
+* "SGI Free Software License B, Version 1.1", see below: 
+*/ 
+/* 
+** License Applicability. Except to the extent portions of this file are 
+** made subject to an alternative license as permitted in the SGI Free 
+** Software License B, Version 1.1 (the "License"), the contents of this 
+** file are subject only to the provisions of the License. You may not use 
+** this file except in compliance with the License. You may obtain a copy 
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: 
+** 
+** http://oss.sgi.com/projects/FreeB 
+** 
+** Note that, as provided in the License, the Software is distributed on an 
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS 
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND 
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A 
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. 
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation, 
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, 
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. 
+** Copyright in any portions created by third parties is as indicated 
+** elsewhere herein. All Rights Reserved.
+
+ /*!**************************************************************************** 
+@File convexitytest.c 
+@Title Convex Polygon Classification 
+@Author PowerVR 
+@Date 23 April 2007 
+@Copyright Copyright 2007 by Imagination Technologies Limited. 
+@Platform ANSI 
+@Description Functions for determining whether a polygon is convex or not. 
+@DoxygenVer 1.0 1st Release 
+******************************************************************************/ 
+/* convexitytest.c */ 
+/* 
+* C code from the article 
+* "Testing the Convexity of a Polygon" 
+* by Peter Schorn and Frederick Fisher, 
+* (schorn@inf.ethz.ch, fred@kpc.com) 
+* in "Graphics Gems IV", Academic Press, 1994 
+*/ 
+/*!**************************************************************************** 
+@File drvvg.h 
+@Title OpenVG Driver Header 
+@Author PowerVR 
+@Date 22 June 2007 
+@Copyright Copyright 2007- by Imagination Technologies Limited. 
+@Platform ANSI 
+@Description Driver version of OpenVG Macro and API definitions 
+@DoxygenVer 1.0 1st Release 
+******************************************************************************/ 
+/********************************************************************** 
+* * 
+* Sample implementation of openvg.h, version 1.0.1 * 
+* * 
+* Copyright (c) 2005-2007 The Khronos Group * 
+* * 
+**********************************************************************/ 
+/* 
+** Copyright (c) 2007-2009 The Khronos Group Inc. 
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a 
+** copy of this software and/or associated documentation files (the 
+** "Materials"), to deal in the Materials without restriction, including 
+** without limitation the rights to use, copy, modify, merge, publish, 
+** distribute, sublicense, and/or sell copies of the Materials, and to 
+** permit persons to whom the Materials are furnished to do so, subject to 
+** the following conditions: 
+** 
+** The above copyright notice and this permission notice shall be included 
+** in all copies or substantial portions of the Materials. 
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. 
+*/ 
+
+/* 
+** Copyright (c) 2007-2009 The Khronos Group Inc. 
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a 
+** copy of this software and/or associated documentation files (the 
+** "Materials"), to deal in the Materials without restriction, including 
+** without limitation the rights to use, copy, modify, merge, publish, 
+** distribute, sublicense, and/or sell copies of the Materials, and to 
+** permit persons to whom the Materials are furnished to do so, subject to 
+** the following conditions: 
+** 
+** The above copyright notice and this permission notice shall be included 
+** in all copies or substantial portions of the Materials. 
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. 
+*/ 
+/* Platform-specific types and definitions for egl.h 
+* $Revision: 1.2 $ on $Date: 2011/07/26 23:17:28 $ 
+* 
+* Adopters may modify khrplatform.h and this file to suit their platform. 
+* You are encouraged to submit all modifications to the Khronos group so that 
+* they can be included in future versions of this file. Please submit changes 
+* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) 
+* by filing a bug against product "EGL" component "Registry". 
+*/ 
+/* 
+* This document is licensed under the SGI Free Software B License Version 
+* 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . 
+*/ 
+/* Platform-specific types and definitions for OpenGL ES 1.X gl.h 
+* Last modified on 2008/12/19 
+* 
+* Adopters may modify khrplatform.h and this file to suit their platform. 
+* You are encouraged to submit all modifications to the Khronos group so that 
+* they can be included in future versions of this file. Please submit changes 
+* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) 
+* by filing a bug against product "OpenGL-ES" component "Registry". 
+*/ 
+/ * File: fpcomp.c 
+* 
+* Purpose: Sample parser for ARB_fragment_program 
+* 
+* 
+* Author: Benj Lipchak, ATI Research 
+* 
+* Based on ARB_vertex_program sample 
+* implementation from NVIDIA 
+* 
+* Copyright: Copyright (c) 2002 ATI Technologies Inc 
+* 
+* Use of this sample code is subject to the terms and conditions of the 
+* ATI Technologies Inc. Software Development Kit License Agreement. 
+* If you have not accepted and agreed to this License, you have no 
+* rights to use the software contained herein. 
+*/ 
+/* 
+** Copyright (C) 2002, NVIDIA Corporation. 
+** 
+** NVIDIA Corporation("NVIDIA") supplies this software to you in consideration 
+** of your agreement to the following terms, and your use, installation, 
+** modification or redistribution of this NVIDIA software constitutes 
+** acceptance of these terms. If you do not agree with these terms, please do 
+** not use, install, modify or redistribute this NVIDIA software. 
+** 
+** In consideration of your agreement to abide by the following terms, and 
+** subject to these terms, NVIDIA grants you a personal, non-exclusive 
+** license, under NVIDIA's copyrights in this original NVIDIA software (the 
+** "NVIDIA Software"), to use, reproduce, modify and redistribute the NVIDIA 
+** Software, with or without modifications, in source and/or binary forms; 
+** provided that if you redistribute the NVIDIA Software, you must retain the 
+** copyright notice of NVIDIA, this notice and the following text and 
+** disclaimers in all such redistributions of the NVIDIA Software. Neither the 
+** name, trademarks, service marks nor logos of NVIDIA Corporation may be used 
+** to endorse or promote products derived from the NVIDIA Software without 
+** specific prior written permission from NVIDIA. Except as expressly stated 
+** in this notice, no other rights or licenses express or implied, are granted 
+** by NVIDIA herein, including but not limited to any patent rights that may 
+** be infringed by your derivative works or by other works in which the NVIDIA 
+** Software may be incorporated. No hardware is licensed hereunder. 
+** 
+** The NVIDIA Software is provided by NVIDIA on an "AS IS" BASIS, WITHOUT 
+** WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING 
+** WITHOUT LIMITATION WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, 
+** MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE NVIDIA 
+** SOFTWARE OR ITS USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR 
+** PRODUCTS. 
+** 
+** IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, 
+** SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+** LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE 
+** USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE NVIDIA SOFTWARE, 
+** HOWEVER CAUSED, AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING 
+** NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF NVIDIA HAS BEEN ADVISED 
+** OF THE POSSIBILITY OF SUCH DAMAGE.* 
+/* A Bison parser, made by GNU Bison 2.3. */ 
+/* Skeleton interface for Bison's Yacc-like parsers in C 
+Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 
+Free Software Foundation, Inc. 
+This program is free software; you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation; either version 2, or (at your option) 
+any later version. 
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+GNU General Public License for more details. 
+You should have received a copy of the GNU General Public License 
+along with this program; if not, write to the Free Software 
+Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+Boston, MA 02110-1301, USA. */ 
+/* As a special exception, you may create a larger work that contains 
+part or all of the Bison parser skeleton and distribute that work 
+under terms of your choice, so long as that work isn't itself a 
+parser generator using the skeleton or a modified version thereof 
+as a parser skeleton. Alternatively, if you modify or redistribute 
+the parser skeleton itself, you may (at your option) remove this 
+special exception, which will cause the skeleton and the resulting 
+Bison output files to be licensed under the GNU General Public 
+License without this special exception. 
+This special exception was added by the Free Software Foundation in 
+version 2.2 of Bison. */ 
+/************************************************************************** 
+* 
+* Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. 
+* All Rights Reserved. 
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a 
+* copy of this software and associated documentation files (the 
+* "Software"), to deal in the Software without restriction, including 
+* without limitation the rights to use, copy, modify, merge, publish, 
+* distribute, sub license, and/or sell copies of the Software, and to 
+* permit persons to whom the Software is furnished to do so, subject to 
+* the following conditions: 
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL 
+* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, 
+* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+* USE OR OTHER DEALINGS IN THE SOFTWARE. 
+*The above copyright notice and this permission notice (including the 
+* next paragraph) shall be included in all copies or substantial portions 
+* of the Software. 
+* 
+* 
+**************************************************************************/ 
+/* 
+* Copyright © 2007 Red Hat, Inc. 
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a 
+* copy of this software and associated documentation files (the "Software"), 
+* to deal in the Software without restriction, including without limitation 
+* the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+* and/or sell copies of the Software, and to permit persons to whom the 
+* Software is furnished to do so, subject to the following conditions: 
+* 
+* The above copyright notice and this permission notice (including the next 
+* paragraph) shall be included in all copies or substantial portions of the 
+* Software. 
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+* SOFTWARE. 
+* 
+* Authors: 
+* Dave Airlie <airlied@redhat.com>
+
+/*
+ * Copyright © 2008 Kristian Høgsberg
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
diff --git a/conf/layer.conf b/conf/layer.conf
index 190d0b2..e9c2b10 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,3 +8,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "intel"
 BBFILE_PATTERN_intel := "^${LAYERDIR}/"
 BBFILE_PRIORITY_intel = "5"
+
+# Additional license directories.
+LICENSE_PATH += "${LAYERDIR}/common/custom-licenses"
-- 
1.7.3.4

Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin

[Burton, Ross]

On 12 October 2012 00:31,  <nitin.a.kamble@intel.com> wrote:
> Extend the mesa-dri recipe from oecore to avoid conflict with
> files generated by emgd-driver-bin recipe.

The commit message should also say what the high level changes were,
in this case

> +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image
> +# is bundling the emgd driver.

I'm not entirely keen on this level of deep hackery, it looks very
fragile.   Is there any difference in the headers installed by emgd
and mesa?  An alternative would be to consider mesa a more canonical
source of GL headers for the build, and change EMGD to not install
anything to staging.   This would mean that emgd wouldn't build-time
provide any virtual/libgl packages, just runtime provides so that the
image can be built using EMGD and Mesa's libgl.

FYI, In ross/xorg I've started re-arranging the packaging of mesa, so
that the packages are called libgl-mesa and RPROVIDE libgl.  I plan to
make the same changes to EMGD once I have the shlib resolution sorted.

Ross

Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin

[Kamble, Nitin A]

> -----Original Message-----
> From: Burton, Ross [mailto:ross.burton@intel.com]
> Sent: Friday, October 12, 2012 2:49 AM
> To: Kamble, Nitin A
> Cc: Zanussi, Tom; Hart, Darren; yocto@yoctoproject.org
> Subject: Re: [yocto] [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with
> emgd-driver-bin
> 
> On 12 October 2012 00:31,  <nitin.a.kamble@intel.com> wrote:
> > Extend the mesa-dri recipe from oecore to avoid conflict with files
> > generated by emgd-driver-bin recipe.
> 
> The commit message should also say what the high level changes were, in
> this case
> 

The information about high level change is in the next lines in the comment. As seen in the lines bellow here.

> > +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the
> > +BSP image # is bundling the emgd driver.
> 
> I'm not entirely keen on this level of deep hackery, it looks very
> fragile. 

What seems like the hackery here, is simple change to EXTRA_OECONF variable of the mesa-dri recipe. But the way original mesa-dri recipe is written, there is no simpler bitbake way to change EXTRA_OECONF.

>  Is there any difference in the headers installed by emgd
> and mesa?  

Yes, there are differences, the EMGD recipe is providing GL implementation at ABI level which has not going in the open source version of mesa-dri.

> An alternative would be to consider mesa a more canonical
> source of GL headers for the build, and change EMGD to not install
> anything to staging.   This would mean that emgd wouldn't build-time
> provide any virtual/libgl packages, just runtime provides so that the image
> can be built using EMGD and Mesa's libgl.
> 

There is a reason EMGD recipe is providing these GL libraries in binary form and not in the source form, I think there is EMGD specific proprietary code in these libraries. I can check with EMGD guys to confirm this. 

> FYI, In ross/xorg I've started re-arranging the packaging of mesa, so that the
> packages are called libgl-mesa and RPROVIDE libgl.  I plan to make the same
> changes to EMGD once I have the shlib resolution sorted.
> 

Looks like this kind of packaging change would not change functionality of both recipes. 

Cheers,
Nitin


> Ross

Re: [PATCHv4 0/8] Misc meta-intel commits

[Tom Zanussi]

On Thu, 2012-10-11 at 16:30 -0700, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
> 
> This v4 pull request add these extra  commits compared to v3
>   mesa-dri.bbappend: avoid conflict with emgd-driver-bin
>   emgd-driver-bin: note all the EMGD licenses
>   custom-licenses dir for emgd recipe Licenses
> 

All except 'mesa-dri.bbappend: avoid conflict with emgd-driver-bin'
pulled in to meta-intel/master.

The one change I made was to tweak the commit subject lines to the
proper format for each of the commits that didn't have the normal
[component: short-description] form like the other commits in
meta-intel.

Thanks,

Tom

> Thanks,
> Nitin
> 
> The following changes since commit 5d8a05811101f7d69994f4028ec620c4480f6da4:
> 
>   Fix use of PRINC in meta-intel BSPs (2012-10-09 16:04:30 -0700)
> 
> are available in the git repository at:
>   git://git.yoctoproject.org/meta-intel-contrib nitin/misc
>   http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc
> 
> Nitin A Kamble (8):
>   xf86-video-intel: Bring 2.20.0 version to match released graphics
>     stack
>   crownbay.conf: specify the 8.0.4 version as preferred version of
>     mesa-dri
>   emgd-driver_bin_1.10: Remove in favor of 1.14
>   fishriver BSP retirement
>   update maintainers of various BSPs
>   mesa-dri.bbappend: avoid conflict with emgd-driver-bin
>   emgd-driver-bin: note all the EMGD licenses
>   custom-licenses dir for emgd recipe Licenses
> 
>  MAINTAINERS                                        |   16 +-
>  .../Intel-software-license-emgd-1.14               |   42 ++
>  ...-space-graphics-driver-binary-license-emgd-1.14 |  559 ++++++++++++++++++++
>  .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   24 +
>  .../xorg-driver/emgd-driver-bin_1.10.bb            |   93 ----
>  .../xorg-driver/emgd-driver-bin_1.14.bb            |    5 +-
>  .../xorg-driver/xf86-video-intel_2.20.0.bb         |   27 +
>  .../xorg-driver/xorg-driver-common.inc             |   33 ++
>  .../xorg-driver/xorg-driver-video.inc              |    4 +
>  conf/layer.conf                                    |    3 +
>  meta-chiefriver/README                             |   11 +
>  meta-crownbay/README                               |    2 +-
>  meta-crownbay/conf/machine/crownbay.conf           |    2 +-
>  meta-emenlow/README                                |    2 +-
>  meta-fishriver/COPYING.MIT                         |   17 -
>  meta-fishriver/README                              |  114 ----
>  meta-fishriver/README.sources                      |   17 -
>  meta-fishriver/conf/layer.conf                     |   12 -
>  meta-fishriver/conf/machine/fishriver.conf         |   17 -
>  .../formfactor/formfactor/fishriver/machconfig     |    3 -
>  .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    3 -
>  .../xserver-xf86-config/fishriver/xorg.conf        |   26 -
>  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
>  .../linux/linux-yocto-rt_3.0.bbappend              |    8 -
>  .../linux/linux-yocto-rt_3.2.bbappend              |    8 -
>  .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 -
>  .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 -
>  .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    8 -
>  meta-jasperforest/README                           |    2 +-
>  meta-sugarbay/README                               |    2 +-
>  30 files changed, 717 insertions(+), 361 deletions(-)
>  create mode 100644 common/custom-licenses/Intel-software-license-emgd-1.14
>  create mode 100644 common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14
>  create mode 100644 common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
>  delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb
>  create mode 100644 common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb
>  create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-common.inc
>  create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-video.inc
>  delete mode 100644 meta-fishriver/COPYING.MIT
>  delete mode 100644 meta-fishriver/README
>  delete mode 100644 meta-fishriver/README.sources
>  delete mode 100644 meta-fishriver/binary/.gitignore
>  delete mode 100644 meta-fishriver/conf/layer.conf
>  delete mode 100644 meta-fishriver/conf/machine/fishriver.conf
>  delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig
>  delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
>  delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf
>  delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>  delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
>  delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
>  delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
>  delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
>  delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
> 

Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin

[Darren Hart]

On 10/11/2012 04:31 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
> 
> Extend the mesa-dri recipe from oecore to avoid conflict with
> files generated by emgd-driver-bin recipe.
> 
> This extention is needed only when emgd-driver-bin recipe is
> included in the target image, so the code is conditional to
> run only on the machine with emgd graphics driver.
> 
> The emgd binary driver also provides egl, gles1, gles2 library & headers.
> To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image
> is bundling the emgd driver.
> 
> This commits avoids these build warning
> 
> WARNING: The recipe is trying to install files into a shared area when those files already exist. Those files are:
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/KHR/khrplatform.h
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglplatform.h
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglext.h
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/egl.h
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glplatform.h
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/gl.h
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glext.h
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2ext.h
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2.h
>    /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2platform.h
> 
> This resolves part of the issue reported on the bug:
> [Yocto #3238]
> 
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>  .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   24 ++++++++++++++++++++
>  1 files changed, 24 insertions(+), 0 deletions(-)
>  create mode 100644 common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> 
> diff --git a/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> new file mode 100644
> index 0000000..6bfa968
> --- /dev/null
> +++ b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> @@ -0,0 +1,24 @@
> +
> +# The emgd binary driver also provides egl, gles1, gles2 library & headers.
> +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image
> +# is bundling the emgd driver.
> +
> +python __anonymous () {
> +    import re
> +    xserver = d.getVar('XSERVER', True)
> +    if 'emgd-driver-bin' in xserver.split(' '):
> +        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
> +	take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
> +	put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
> +        pattern = re.compile("--with-egl-platforms")
> +        new_extra_oeconf = [ ]
> +	for i in extra_oeconf:
> +            if ( i not in take_out ) and ( not pattern.match(i)):
> +                new_extra_oeconf.append(i)
> +        for i in put_in:
> +            new_extra_oeconf.append(i)
> +
> +        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
> +        depends = d.getVar('DEPENDS', True)
> +        d.setVar('DEPENDS', depends + " emgd-driver-bin")

Odd mix of whitespace and tabs above.

Also, I have to agree with Ross. This places very specific knowledge of
an external package in the general purpose recipe. This is opposite of
how these things should be built up.

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin

[Kamble, Nitin A]

> -----Original Message-----
> From: Hart, Darren
> Sent: Monday, October 15, 2012 9:10 AM
> To: Kamble, Nitin A
> Cc: Zanussi, Tom; yocto@yoctoproject.org
> Subject: Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-
> driver-bin
> 
> On 10/11/2012 04:31 PM, nitin.a.kamble@intel.com wrote:
> > From: Nitin A Kamble <nitin.a.kamble@intel.com>
> >
> > Extend the mesa-dri recipe from oecore to avoid conflict with files
> > generated by emgd-driver-bin recipe.
> >
> > This extention is needed only when emgd-driver-bin recipe is included
> > in the target image, so the code is conditional to run only on the
> > machine with emgd graphics driver.
> >
> > The emgd binary driver also provides egl, gles1, gles2 library & headers.
> > To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP
> > image is bundling the emgd driver.
> >
> > This commits avoids these build warning
> >
> > WARNING: The recipe is trying to install files into a shared area when those
> files already exist. Those files are:
> >    /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/usr/include/KHR/khrplatform.h
> >    /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglplatform.h
> >    /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglext.h
> >    /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/usr/include/EGL/egl.h
> >    /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/usr/include/GLES/glplatform.h
> >    /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/usr/include/GLES/gl.h
> >    /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/usr/include/GLES/glext.h
> >    /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2ext.h
> >    /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2.h
> >
> > /srv/home/nitin/build-test-bsps/build-
> crownbay/tmp/sysroots/crownbay/u
> > sr/include/GLES2/gl2platform.h
> >
> > This resolves part of the issue reported on the bug:
> > [Yocto #3238]
> >
> > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> > ---
> >  .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   24
> ++++++++++++++++++++
> >  1 files changed, 24 insertions(+), 0 deletions(-)  create mode 100644
> > common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> >
> > diff --git a/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> > b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> > new file mode 100644
> > index 0000000..6bfa968
> > --- /dev/null
> > +++ b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> > @@ -0,0 +1,24 @@
> > +
> > +# The emgd binary driver also provides egl, gles1, gles2 library & headers.
> > +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the
> > +BSP image # is bundling the emgd driver.
> > +
> > +python __anonymous () {
> > +    import re
> > +    xserver = d.getVar('XSERVER', True)
> > +    if 'emgd-driver-bin' in xserver.split(' '):
> > +        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
> > +	take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
> > +	put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
> > +        pattern = re.compile("--with-egl-platforms")
> > +        new_extra_oeconf = [ ]
> > +	for i in extra_oeconf:
> > +            if ( i not in take_out ) and ( not pattern.match(i)):
> > +                new_extra_oeconf.append(i)
> > +        for i in put_in:
> > +            new_extra_oeconf.append(i)
> > +
> > +        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
> > +        depends = d.getVar('DEPENDS', True)
> > +        d.setVar('DEPENDS', depends + " emgd-driver-bin")
> 
> Odd mix of whitespace and tabs above.
> 
> Also, I have to agree with Ross. This places very specific knowledge of an
> external package in the general purpose recipe. This is opposite of how these
> things should be built up.
> 

Whitespace issues can be solved easily. But if this solution is not acceptable, then I am not sure how to solve the issue. Do we push the issue to 1.4? 

Nitin

> --
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Linux Kernel

Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin

[Darren Hart]

On 10/16/2012 03:17 PM, Kamble, Nitin A wrote:
> 
> 
>> -----Original Message-----
>> From: Hart, Darren
>> Sent: Monday, October 15, 2012 9:10 AM
>> To: Kamble, Nitin A
>> Cc: Zanussi, Tom; yocto@yoctoproject.org
>> Subject: Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-
>> driver-bin
>>
>> On 10/11/2012 04:31 PM, nitin.a.kamble@intel.com wrote:
>>> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>>>
>>> Extend the mesa-dri recipe from oecore to avoid conflict with files
>>> generated by emgd-driver-bin recipe.
>>>
>>> This extention is needed only when emgd-driver-bin recipe is included
>>> in the target image, so the code is conditional to run only on the
>>> machine with emgd graphics driver.
>>>
>>> The emgd binary driver also provides egl, gles1, gles2 library & headers.
>>> To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP
>>> image is bundling the emgd driver.
>>>
>>> This commits avoids these build warning
>>>
>>> WARNING: The recipe is trying to install files into a shared area when those
>> files already exist. Those files are:
>>>    /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/usr/include/KHR/khrplatform.h
>>>    /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglplatform.h
>>>    /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglext.h
>>>    /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/usr/include/EGL/egl.h
>>>    /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/usr/include/GLES/glplatform.h
>>>    /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/usr/include/GLES/gl.h
>>>    /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/usr/include/GLES/glext.h
>>>    /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2ext.h
>>>    /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2.h
>>>
>>> /srv/home/nitin/build-test-bsps/build-
>> crownbay/tmp/sysroots/crownbay/u
>>> sr/include/GLES2/gl2platform.h
>>>
>>> This resolves part of the issue reported on the bug:
>>> [Yocto #3238]
>>>
>>> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
>>> ---
>>>  .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   24
>> ++++++++++++++++++++
>>>  1 files changed, 24 insertions(+), 0 deletions(-)  create mode 100644
>>> common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
>>>
>>> diff --git a/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
>>> b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
>>> new file mode 100644
>>> index 0000000..6bfa968
>>> --- /dev/null
>>> +++ b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
>>> @@ -0,0 +1,24 @@
>>> +
>>> +# The emgd binary driver also provides egl, gles1, gles2 library & headers.
>>> +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the
>>> +BSP image # is bundling the emgd driver.
>>> +
>>> +python __anonymous () {
>>> +    import re
>>> +    xserver = d.getVar('XSERVER', True)
>>> +    if 'emgd-driver-bin' in xserver.split(' '):
>>> +        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
>>> +	take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
>>> +	put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
>>> +        pattern = re.compile("--with-egl-platforms")
>>> +        new_extra_oeconf = [ ]
>>> +	for i in extra_oeconf:
>>> +            if ( i not in take_out ) and ( not pattern.match(i)):
>>> +                new_extra_oeconf.append(i)
>>> +        for i in put_in:
>>> +            new_extra_oeconf.append(i)
>>> +
>>> +        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
>>> +        depends = d.getVar('DEPENDS', True)
>>> +        d.setVar('DEPENDS', depends + " emgd-driver-bin")
>>
>> Odd mix of whitespace and tabs above.
>>
>> Also, I have to agree with Ross. This places very specific knowledge of an
>> external package in the general purpose recipe. This is opposite of how these
>> things should be built up.
>>
> 
> Whitespace issues can be solved easily. But if this solution is not acceptable, then I am not sure how to solve the issue. Do we push the issue to 1.4? 

Can you define a variable that EXTRA_OECONF includes which can be
manipulated in a bbappend in the meta-intel? This would keep this
complex logic out of the core recipe and move into the place that
actually needs it.

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin

[Kamble, Nitin A]

> >>>
> >>> diff --git a/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> >>> b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> >>> new file mode 100644
> >>> index 0000000..6bfa968
> >>> --- /dev/null
> >>> +++ b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> >>> @@ -0,0 +1,24 @@
> >>> +
> >>> +# The emgd binary driver also provides egl, gles1, gles2 library &
> headers.
> >>> +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the
> >>> +BSP image # is bundling the emgd driver.
> >>> +
> >>> +python __anonymous () {
> >>> +    import re
> >>> +    xserver = d.getVar('XSERVER', True)
> >>> +    if 'emgd-driver-bin' in xserver.split(' '):
> >>> +        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
> >>> +	take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
> >>> +	put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
> >>> +        pattern = re.compile("--with-egl-platforms")
> >>> +        new_extra_oeconf = [ ]
> >>> +	for i in extra_oeconf:
> >>> +            if ( i not in take_out ) and ( not pattern.match(i)):
> >>> +                new_extra_oeconf.append(i)
> >>> +        for i in put_in:
> >>> +            new_extra_oeconf.append(i)
> >>> +
> >>> +        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
> >>> +        depends = d.getVar('DEPENDS', True)
> >>> +        d.setVar('DEPENDS', depends + " emgd-driver-bin")
> >>
> >> Odd mix of whitespace and tabs above.
> >>
> >> Also, I have to agree with Ross. This places very specific knowledge
> >> of an external package in the general purpose recipe. This is
> >> opposite of how these things should be built up.
> >>
> >
> > Whitespace issues can be solved easily. But if this solution is not
> acceptable, then I am not sure how to solve the issue. Do we push the issue
> to 1.4?
> 
> Can you define a variable that EXTRA_OECONF includes which can be
> manipulated in a bbappend in the meta-intel? This would keep this complex
> logic out of the core recipe and move into the place that actually needs it.

If we can modify the recipe in poky, then this method is not needed to achieve same thing. But because of release we may not be able to do it.

Nitin


> 
> --
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Linux Kernel