[PATCH 1/9] meta-crownbay: switch to linux-yocto 3.0 kernel

[PATCH 1/9] meta-crownbay: switch to linux-yocto 3.0 kernel

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Switch crownbay and crownbay-noemgd to the 3.0 kernel, lock it down,
and update kernel SRCREVs.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    2 ++
 meta-crownbay/conf/machine/crownbay.conf           |    2 ++
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   15 +++++++++++++++
 3 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend

diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 0219bd1..0a82b54 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto = "3.0+git%"
+
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 323c8c1..b4ea4b4 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto = "3.0+git%"
+
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
new file mode 100644
index 0000000..c9aef72
--- /dev/null
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_crownbay = "crownbay"
+KMACHINE_crownbay  = "yocto/standard/crownbay"
+KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
+
+COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
+KMACHINE_crownbay-noemgd  = "yocto/standard/crownbay"
+KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto_crownbay ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
+SRCREV_meta_pn-linux-yocto_crownbay ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
+
+SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
+SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
-- 
1.7.0.4

[PATCH 2/9] meta-crownbay: new recipe for emgd 1.8 driver binaries

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

This adds a new recipe for the emgd 1.8 driver binaries.

The emgd-driver-bin recipe now automatically downloads and installs
EMGD using the new click-through-free tarball, but since the binaries
still fall under a non-free license, we need to prevent it from being
accidentally installed in an image.

We therefore make sure it's labeled with 'EMGD_LICENSE'.  In order to
build an image that contains EMGD, the user now needs to add a
'EMGD_LICENSE = "yes"' line to local.conf.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../xorg-xserver/emgd-driver-bin_1.8.bb            |   46 ++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)
 create mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb

diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
new file mode 100644
index 0000000..be19e5e
--- /dev/null
+++ b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
@@ -0,0 +1,46 @@
+SUMMARY = "EMGD 1.8 xserver binaries"
+DESCRIPTION = "EMGD 1.8 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 'commercial' and you need to add COMMERCIAL_LICENSE \
+= \"\" in order to enable it in a build."
+LICENSE = "Intel-binary-only"
+PR = "r0"
+
+EMGD_LICDIR = "IEMGD_HEAD_Linux/License"
+EMGD_RPMDIR = "IEMGD_HEAD_Linux/MeeGo1.2"
+
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LICDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
+
+SRC_URI = "http://edc.intel.com/App_Shared/Downloads/Lin_EMGD_1_8_RC_2032.tgz"
+
+FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers"
+FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
+
+S = "${WORKDIR}/${EMGD_RPMDIR}"
+
+do_install () {
+    rpm2cpio.sh ${S}/emgd-bin*.rpm | cpio -id
+
+    install -d -m 0755                    ${D}/${libdir}/dri
+    install -d -m 0755                    ${D}/${libdir}/xorg/modules/drivers
+    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/
+
+    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
+}
+
+LEAD_SONAME = "libEGL.so"
+
+addtask check_emgd_license before do_fetch
+
+python do_check_emgd_license() {
+    pn = bb.data.getVar('PN', d, 1)
+    emgd_license = bb.data.getVar('EMGD_LICENSE', d, 1)
+    if not emgd_license or not emgd_license.lower() == "yes":
+        bb.debug(1, "Skipping %s because it has a non-free license" % pn)
+        raise bb.parse.SkipPackage("because it requires EMGD_LICENSE = \"yes\" in local.conf to ship")
+}
-- 
1.7.0.4

[PATCH 3/9] meta-crownbay: select emgd 1.8

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Change preferred version of emgd binaries to 1.8.

Signed-off-by: Tom Zanussi <tom.zanussi@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 b4ea4b4..28d2902 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -28,7 +28,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-video-vesa"
 
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.6"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-- 
1.7.0.4

[PATCH 4/9] meta-crownbay: xorg.conf changes

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Update to the ced-generated xorg.conf for 1.8.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../xserver-xf86-config/crownbay/xorg.conf         |    3 ++-
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
index f78a538..fce58f8 100644
--- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
+++ b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
@@ -26,11 +26,12 @@ Section "Device"
     Option     "ALL/1/General/PortOrder"      "40000"
     Option     "ALL/1/General/DisplayConfig"  "1"
     Option     "ALL/1/General/DisplayDetect"  "1"
+    Option     "ALL/1/General/TuningWA" "1"
     Option     "ALL/1/Port/4/General/name"           "lvds"
     Option     "ALL/1/Port/4/General/EdidAvail"      "3"
     Option     "ALL/1/Port/4/General/EdidNotAvail"   "1"
     Option     "ALL/1/Port/4/General/Rotation"       "0"
-    Option     "ALL/1/Port/4/General/Edid"           "1"
+    Option     "ALL/1/Port/4/General/Edid"           "0"
 EndSection
 
 Section "ServerLayout"
diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 4b8d0e6..1461431 100644
--- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1,3 +1,4 @@
 THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
 
+PR := "${PR}.1"
-- 
1.7.0.4

[PATCH 5/9] meta-crownbay: update README

[tom.zanussi]

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

From: Tom Zanussi <tom.zanussi@intel.com>

With the new emgd-driver-bin recipe, the extensive instructions on how
to manually download and set up EMGD for the build are no longer
necessary.  Those instructions have been replaced with the simpler set
of instructions now needed to build crownbay with EMGD.

Changes to reflect the new image names and a couple other minor
cleanups are also included.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-crownbay/README |  206 ++++++++++----------------------------------------
 1 files changed, 41 insertions(+), 165 deletions(-)

diff --git a/meta-crownbay/README b/meta-crownbay/README
index 89056ed..5957cdd 100644
--- a/meta-crownbay/README
+++ b/meta-crownbay/README
@@ -6,7 +6,7 @@ The Crown Bay platform consists of the Intel Atom Z6xx processor,
 plus the Intel EG20T Platform Controller Hub (Tunnel Creek + Topcliff).
 
 It also supports the E6xx embedded on-chip graphics via the Intel
-Embedded Media and Graphics Driver (EMGD) 1.6 Gold Driver.
+Embedded Media and Graphics Driver (EMGD) 1.8 Driver.
 
 Table of Contents
 =================
@@ -33,14 +33,20 @@ bblayers.conf e.g.:
 The meta-crownbay layer contains support for two different machine
 configurations. These configurations are identical except for the fact
 that the one prefixed with 'crownbay' makes use of the
-Intel-proprietary EMGD 1.6 graphics driver, while the one prefixed
+Intel-proprietary EMGD 1.8 graphics driver, while the one prefixed
 with 'crownbay-noemgd' does not.
 
-If you want to enable the layer that supports EMGD graphics add
+If you want to enable the layer that supports EMGD graphics add the
 following to the local.conf file:
 
   MACHINE ?= "crownbay"
 
+You also need to add the line:
+
+  EMGD_LICENSE = "yes"
+
+to the local.conf file.
+
 If you want to enable the layer that does not support EMGD graphics
 add the following to the local.conf file:
 
@@ -48,8 +54,8 @@ add the following to the local.conf file:
 
 You should then be able to build a crownbay image as such:
 
-  $ source poky-init-build-env
-  $ bitbake poky-image-sato-live
+  $ 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
@@ -59,10 +65,11 @@ 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.  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.
+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. Special notes for building the meta-crownbay BSP layer
@@ -70,182 +77,51 @@ II. Special notes for building the meta-crownbay BSP layer
 
 The meta-crownbay layer makes use of the proprietary Intel EMGD
 userspace drivers when building the "crownbay" machine (but not when
-building the "crownbay-noemgd" machine).  If you got the BSP from the
-'BSP Downloads' section of the Yocto website, the EMGD binaries needed
-to perform the build will already be present in the BSP, located in
-the recipes-graphics/xorg-xserver/emgd-driver-bin-1.6 directory, and
-you can ignore the rest of this section.
+building the "crownbay-noemgd" machine).
 
-If you didn't get the BSP from the 'BSP Downloads' section of the
-Yocto website, you have two choices:
+As mentioned in Section I, you need to add the line:
 
-- You can download a tarball containing an rpm that contains the
-  binaries and extract the binaries from that, and copy them to the
-  proper location in the meta-crownbay layer.
+  EMGD_LICENSE = "yes"
 
-- You can download a Windows executable from the official EMGD
-  website, extract the binaries from it, and copy them to the proper
-  location in the meta-crownbay layer.
+to the local.conf file in order for the build to succeed.
 
-The following subsections describe each option in detail.
+The crownbay BSP EMGD_LICENSE default setting causes the build to fail
+in order to prevent users from inadvertently creating and possibly
+distributing images containing the non-free EMGD package.  Setting the
+EMGD_LICENSE variable as shown above essentially tells the build
+system that you're OK with the fact that the non-free EMGD package
+will be installed in the image.
 
+Once you've done a build, you can examine the EMGD license(s) in the
+IEMGD_HEAD_Linux/License directory of the emgd-driver-bin work
+directory of the build.
 
-IIa Downloading and extracting the binaries using the EMGD Linux tarball
-------------------------------------------------------------------------
+Alternatively, you can examine the licenses before building by
+downloading the EMGD 1.8 Driver and looking at the licenses in the
+downloaded tarball.
 
-The first step of the process is to download the EMGD 1.6 Gold Driver.
-Here is the current link to the URL which it can be downloaded from:
+Here is the current link to the URL from which it can be downloaded:
 
 http://edc.intel.com/Software/Downloads/EMGD/
 
 In the Download Now tab, select:
 
 Intel® architecture-based product: Linux Tar Ball
-Operating System: MeeGo 1.0 IVI Linux (kernel 2.6.33.3, X.server 1.8.0)
+Operating System: MeeGo* 1.2 IVI Linux* (kernel 2.6.37, X.server 1.9, Mesa 7.9)
 
-That will give you a large tar file:
+That will give you a large .tgz file:
 
-Lin_EMGD_1_6_RC_1922.tar
+Lin_EMGD_1_8_RC_2032.tgz
 
 Extract the files in the tar file, which will in turn give you a
 directory named IEMGD_HEAD_Linux.
 
-The binaries are contained in an rpm file; you can extract the
-binaries from the rpm file using rpm2cpio and cpio:
-
-$ cd IEMGD_HEAD_Linux/MeeGo1.2
-$ rpm2cpio emgd-bin-1922-1.6.i586.rpm > emgd-bin-1922-1.6.i586.cpio
-$ mkdir extracted; cd extracted
-$ cpio -idv < ../poky-image-minimal-initramfs-emenlow.cpio
-
-Finally, you can copy the xorg-xserver binaries to the
-emgd-driver-bin-1.6 directory in the meta-crownbay layer:
-
-$ cp -a usr/lib meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.6
-
-You also need to copy the IEMGD License.txt file to the same directory:
-
-$ cp IEMGD_HEAD_Linux/License/License.txt meta-crownbay/recipes/xorg-xserver/emgd-driver-bin-1.6
-
-At this point, you should be able to build meta-crownbay images as usual.
-
-
-IIb Extracting the binaries using the graphical ced application
----------------------------------------------------------------
-
-These steps require that you run a graphical application in Windows.
-Windows 7 was used for these instructions, but it shouldn't matter
-which version of Windows you use.
-
-The first step of the process is to download the EMGD 1.6 Gold Driver.
-Here is the current link to the URL which it can be downloaded from:
-
-http://edc.intel.com/Software/Downloads/EMGD/
-
-In the Download Now tab, select:
-
-Intel® architecture-based product: Intel Atom Processor E6XX Series
-Operating System: MeeGo 1.0 IVI Linux (kernel 2.6.33.3, X.server 1.8.0)
-
-That will give you a large zip file:
-
-IEMGD_1_6_GOLD_1922.zip
-
-Extract the files in the zip file, which will in turn give you a large
-.exe file:
-
-IEMGD_1_6_GOLD_ALL_1922.exe
-
-Run IEMGD_1_6_GOLD_ALL_1922.exe to install, accept licenses, etc.
-
-If it says to install watcom, follow the instructions to do that.
-
-When the installation completes, an application named "emgd-ced" will
-be present in the install directory.  Double-click to run it.
-
-Select the menu item: New Configuration
-
-In the tabbed page, make the following selections and/or enter the
-specified data:
-
-Configuration File Name: myconfig
-Platform Chipset: Intel Atom Processor E6xx
-Port Devices: LVDS, sDVO
-
-Hit the 'Next' button.
+The applicable Licenses are contained in the License directory under
+IEMGD_HEAD_Linux.
 
-On the next tabbed page, make the following selections and/or enter
-the specified data:
 
-Readable Port Name: portname0
-Encoder Configuration: Select sDVO Device: Internal LVDS
-
-Hit the 'Finish' button.
-
-Select the menu item: New Package
-
-In the tabbed page, make the following selections and/or enter the
-specified data:
-
-Package File Name: mypackage
-Configurations: selec myconfig.cnfg
-Target OS: Linux operating System
-
-Hit the 'Finish' button.
-
-Select the menu item: Generate Installation
-
-This will create the EMGD installation package:
-
-Generating EMGD installation...
-
-The installation package should now be under the 'workspace'
-subdirectory of the directory you installed to:
-
-workspace/installation/mypackage.pkg_installation/IEMGD_HEAD_Linux/IEMGD_HEAD_Linux.tgz
-
-This is the file you are interested in.  Copy it to your Poky build
-system, and uncompress/untar it:
-
-$ tar cvfz IEMGD_HEAD_Linux.tgz
-
-The binaries are contained in an rpm file; you can extract the
-binaries from the rpm file using rpm2cpio and cpio:
-
-$ cd IEMGD_HEAD_Linux/MeeGo1.2
-$ rpm2cpio emgd-bin-1922-1.6.i586.rpm > emgd-bin-1922-1.6.i586.cpio
-$ mkdir extracted; cd extracted
-$ cpio -idv < ../poky-image-minimal-initramfs-emenlow.cpio
-
-Finally, you can copy the xorg-xserver binaries to the
-emgd-driver-bin-1.6 directory in the meta-crownbay layer:
-
-$ cp -a usr/lib meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.6
-
-You also need to copy the IEMGD License.txt file to the same directory:
-
-$ cp IEMGD_HEAD_Linux/License/License.txt meta-crownbay/recipes/xorg-xserver/emgd-driver-bin-1.6
-
-At this point, you should be able to build meta-crownbay images as usual.
-
-----
-
-For reference, the EMGD Driver documentation is also available at the
-above link.
-
-The specific text of the document is:
-
-User Guide: Intel® Embedded Media and Graphics Driver, EFI Video
-Driver, EPOG, and Video BIOS v1.6 for Windows* XP and Linux* Provides
-installation requirements/procedures & describes the vbios/firmware,
-configuration options, & functionality of Intel® EMGD under Windows* &
-Linux*. Refer to guide for details.
-
-April 2011
-
-
-II. Booting the images in /binary
-=================================
+III. 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.
@@ -254,7 +130,7 @@ 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=poky-image-sato-live-crownbay-20101207053738.hddimg of=/dev/sdf
+# dd if=core-image-sato-crownbay-20101207053738.hddimg of=/dev/sdf
 # sync
 # eject /dev/sdf
 
-- 
1.7.0.4

[PATCH 0/9] meta-intel: EMGD 1.8 and 3.0 kernel upgrade, v3

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

This patchset switches crownbay to the 3.0 kernel and upgrades emgd
to 1.8.  Both crownbay and crownbay-noemgd were successfully built and
boot tested into sato.

It also does the same for fri2, after adding a new fri2 machine config
and renaming the current one to fri2-noemgd.  Both fri2 and fri2-noemgd
were successfully built and boot tested into sato.

One major change coming out of this patchset is that the emgd binary
bits no longer have to be downloaded and extracted manually - the new
emgd-driver-bin recipe takes care of that now.

However, after these changes the crownbay and fri2 (but not the
crownbay-noemgd and fri2-noemgd) recipes will not build successfully
unless the user specifies EMGD_LICENSE = "yes" as mentioned in the READMEs.

Changes since v2:

  - removed COMMERCIAL_LICENSE from crownbay and fri2 layers
  - added EMGD_LICENSE to emgd-driver-bin recipe
  - updated READMEs to reflect EMGD_LICENSE

The following changes since commit fa92a44396b16be74f0de10256b0d42e52cf0bb6:
  Tom Zanussi (1):
        meta-intel: update linux-yocto 3.0 kernel SRCREVs

are available in the git repository at:

  git://git.yoctoproject.org/meta-intel.git tzanussi/emgd-1.8v3
  http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/emgd-1.8v3

Tom Zanussi (9):
  meta-crownbay: switch to linux-yocto 3.0 kernel
  meta-crownbay: new recipe for emgd 1.8 driver binaries
  meta-crownbay: select emgd 1.8
  meta-crownbay: xorg.conf changes
  meta-crownbay: update README
  meta-fri2: add EMGD 1.8 capabilities to fri2
  meta-intel: move emgd-driver-bin_1.8 to common
  meta-fri2: add common/recipes-graphics to BBFILES
  meta-fri2: update README

 .../xorg-xserver/emgd-driver-bin_1.8.bb            |   46 +++++
 meta-crownbay/README                               |  206 ++++----------------
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    2 +
 meta-crownbay/conf/machine/crownbay.conf           |    4 +-
 .../xserver-xf86-config/crownbay/xorg.conf         |    3 +-
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 +
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   15 ++
 meta-fri2/README                                   |   95 ++++++++-
 meta-fri2/conf/layer.conf                          |    4 +-
 meta-fri2/conf/machine/fri2-noemgd.conf            |   36 ++++
 meta-fri2/conf/machine/fri2.conf                   |    5 +-
 .../formfactor/formfactor/fri2-noemgd/machconfig   |    3 +
 .../recipes-core/tasks/task-core-tools.bbappend    |    1 +
 .../xserver-xf86-config/fri2-noemgd/xorg.conf      |   26 +++
 .../xserver-xf86-config/fri2/xorg.conf             |   48 ++++--
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 +
 16 files changed, 312 insertions(+), 192 deletions(-)
 create mode 100644 common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
 create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
 create mode 100644 meta-fri2/conf/machine/fri2-noemgd.conf
 create mode 100644 meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig
 create mode 100644 meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf

[PATCH 6/9] meta-fri2: add EMGD 1.8 capabilities to fri2

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

This patch essentially adds a new EMGD-capable 'fri2' machine to
meta-fri2.

The current version with vesa graphics will become fri2-noemgd; fri2
will become the version with EMGD graphics.  This patch does the
fri2->fri2-noemgd renaming and adds the new files for fri2, and
updates the necessary .bbappends to support both fri2 and fri2-noemgd.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-fri2/conf/machine/fri2-noemgd.conf            |   36 +++++++++++++++
 meta-fri2/conf/machine/fri2.conf                   |    5 ++-
 .../formfactor/formfactor/fri2-noemgd/machconfig   |    3 +
 .../recipes-core/tasks/task-core-tools.bbappend    |    1 +
 .../xserver-xf86-config/fri2-noemgd/xorg.conf      |   26 +++++++++++
 .../xserver-xf86-config/fri2/xorg.conf             |   48 ++++++++++++++-----
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 ++++
 7 files changed, 114 insertions(+), 14 deletions(-)
 create mode 100644 meta-fri2/conf/machine/fri2-noemgd.conf
 create mode 100644 meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig
 create mode 100644 meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf

diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
new file mode 100644
index 0000000..fea43a2
--- /dev/null
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: fri2
+
+#@DESCRIPTION: Machine configuration for Fish River Island II systems
+# i.e. E660 + EG20T
+
+include conf/machine/include/tune-atom.inc
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
+                    acpi serial usbgadget wifi 3g"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
+
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+XSERVER ?= "xserver-xf86-dri-lite \
+           xf86-input-mouse \
+           xf86-input-keyboard \
+           xf86-input-evdev \
+           xf86-input-synaptics \
+           xf86-video-vesa"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+
+IMAGE_FSTYPES ?= "ext3 cpio.gz live"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index fea43a2..97b6a2e 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -24,7 +24,10 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
-           xf86-video-vesa"
+           emgd-driver-bin"
+
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig b/meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig
new file mode 100644
index 0000000..ffce012
--- /dev/null
+++ b/meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1
diff --git a/meta-fri2/recipes-core/tasks/task-core-tools.bbappend b/meta-fri2/recipes-core/tasks/task-core-tools.bbappend
index 5accb2e..aa50c91 100644
--- a/meta-fri2/recipes-core/tasks/task-core-tools.bbappend
+++ b/meta-fri2/recipes-core/tasks/task-core-tools.bbappend
@@ -1,2 +1,3 @@
 RRECOMMENDS_task-core-tools-profile_append_fri2 = " systemtap"
+RRECOMMENDS_task-core-tools-profile_append_fri2-noemgd = " systemtap"
 
diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
new file mode 100644
index 0000000..da4fc3c
--- /dev/null
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
@@ -0,0 +1,26 @@
+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-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
index da4fc3c..fce58f8 100644
--- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
@@ -1,23 +1,45 @@
-Section "Device"
-    Identifier	"Generic VESA"
-    Driver	"vesa"
-EndSection
+##
+## X Config options generated from CED
+## x11 conf skeleton
+## DriverVer=
+##
 
-Section "Monitor"
-    Identifier    "Generic Monitor"
-    Option        "DPMS"
+Section "Screen"
+    Identifier    "Screen0"
+    Device        "IntelEMGD-0"
+    Monitor       "Monitor0"
+    SubSection    "Display"
+    EndSubSection
 EndSection
 
-Section "Screen"
-    Identifier    "Default Screen"
-    Device	  "Generic VESA"
-    Monitor       "Generic Monitor"
-    DefaultDepth  24
+# Primary (First/only) display
+Section "Device"
+    Identifier "IntelEMGD-0"
+    Driver     "emgd"
+    VendorName "Intel(R) DEG"
+    BoardName  "Embedded Graphics"
+    BusID      "0:2:0"
+    Screen      0
+    Option     "PcfVersion"            "1792"
+    Option     "ConfigId"              "1"
+    Option     "ALL/1/name"                   "e6xx"
+    Option     "ALL/1/General/PortOrder"      "40000"
+    Option     "ALL/1/General/DisplayConfig"  "1"
+    Option     "ALL/1/General/DisplayDetect"  "1"
+    Option     "ALL/1/General/TuningWA" "1"
+    Option     "ALL/1/Port/4/General/name"           "lvds"
+    Option     "ALL/1/Port/4/General/EdidAvail"      "3"
+    Option     "ALL/1/Port/4/General/EdidNotAvail"   "1"
+    Option     "ALL/1/Port/4/General/Rotation"       "0"
+    Option     "ALL/1/Port/4/General/Edid"           "0"
 EndSection
 
 Section "ServerLayout"
     Identifier     "Default Layout"
-    Screen         "Default Screen"
+    Screen 0       "Screen0" 0 0
+   # InputDevice    "Mouse0" "CorePointer"
+   # InputDevice    "Keyboard0" "CoreKeyboard"
+   # InputDevice    "DevInputMice" "SendCoreEvents"
 EndSection
 
 Section "ServerFlags"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 98c056f..5cfd295 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -1,6 +1,15 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2  = "yocto/standard/fri2"
+KERNEL_FEATURES_append_fri2 += " cfg/smp.scc"
+
+COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
+KMACHINE_fri2-noemgd  = "yocto/standard/fri2"
+KERNEL_FEATURES_append_fri2-noemgd += " cfg/smp.scc"
 
 SRCREV_machine_pn-linux-yocto_fri2 ?= "9ebb9cf2527250fceee7ccd9c6d3e01c00724bf9"
 SRCREV_meta_pn-linux-yocto_fri2 ?= "9da70812ecddee0f7eeb11675f29497cb997275e"
+
+SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "9ebb9cf2527250fceee7ccd9c6d3e01c00724bf9"
+SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "9da70812ecddee0f7eeb11675f29497cb997275e"
-- 
1.7.0.4

[PATCH 7/9] meta-intel: move emgd-driver-bin_1.8 to common

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

emgd-driver-bin will be shared by multiple BSPs, crownbay and fri2 to
start with, so move them into /common.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../xorg-xserver/emgd-driver-bin_1.8.bb            |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename {meta-crownbay => common}/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb (100%)

diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb b/common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
similarity index 100%
rename from meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
rename to common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
-- 
1.7.0.4

[PATCH 8/9] meta-fri2: add common/recipes-graphics to BBFILES

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Add common/recipes-graphics so fri2 can pick up the EMGD bits in
emgd-driver-bin.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-fri2/conf/layer.conf |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta-fri2/conf/layer.conf b/meta-fri2/conf/layer.conf
index b30e776..261cccc 100644
--- a/meta-fri2/conf/layer.conf
+++ b/meta-fri2/conf/layer.conf
@@ -3,7 +3,9 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
+	${LAYERDIR}/recipes-*/*/*.bbappend \
+	${LAYERDIR}/../common/recipes-graphics/*/*.bb \
+	${LAYERDIR}/../common/recipes-graphics/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "fri2"
 BBFILE_PATTERN_fri2 := "^${LAYERDIR}/"
-- 
1.7.0.4

[PATCH 9/9] meta-fri2: update README

[tom.zanussi]

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

From: Tom Zanussi <tom.zanussi@intel.com>

Update the meta-fri2 README to reflect the addtion of the EMGD
capabilities and new machine.

Changes were also made to reflect the new image names and a couple
other minor cleanups.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-fri2/README |   95 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/meta-fri2/README b/meta-fri2/README
index 7957a7f..eb5baae 100644
--- a/meta-fri2/README
+++ b/meta-fri2/README
@@ -2,12 +2,20 @@ This README file contains information on building the meta-fri2 BSP
 layer, and booting the images contained in the /binary directory.
 Please see the corresponding sections below for details.
 
+The Fish River Island II platform consists of the Intel Atom Z6xx
+processor, plus the Intel EG20T Platform Controller Hub (Tunnel Creek
++ Topcliff), along with a varied assortment of communications options
+and various other machine-to-machine (m2m) capabilities.
+
+It also supports the E6xx embedded on-chip graphics via the Intel
+Embedded Media and Graphics Driver (EMGD) 1.8 Driver.
+
 
 Table of Contents
 =================
 
-  I. Special notes on the meta-fri2 BSP layer
- II. Building the meta-fri2 BSP layer
+  I. Building the meta-fri2 BSP layer
+ II. Special notes for building the meta-fri2 BSP layer
 III. Booting the images in /binary
 
 
@@ -24,14 +32,32 @@ by adding the location of the meta-fri2 layer to bblayers.conf e.g.:
 
   yocto/meta-intel/meta-fri2 \
 
-To enable the fri2 layer, add the fri2 MACHINE to local.conf:
+The meta-fri2 layer contains support for two different machine
+configurations. These configurations are identical except for the fact
+that the one prefixed with 'fri2' makes use of the Intel-proprietary
+EMGD 1.8 graphics driver, while the one prefixed with 'fri2-noemgd'
+does not.
+
+If you want to enable the layer that supports EMGD graphics add the
+following to the local.conf file:
 
   MACHINE ?= "fri2"
 
+You also need to add the line:
+
+  EMGD_LICENSE = "yes"
+
+to the local.conf file.
+
+If you want to enable the layer that does not support EMGD graphics
+add the following to the local.conf file:
+
+  MACHINE ?= "fri2-noemgd"
+
 You should then be able to build a fri2 image as such:
 
-  $ source poky-init-build-env
-  $ bitbake poky-image-sato-live
+  $ 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
@@ -41,10 +67,59 @@ 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.  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.
+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. Special notes for building the meta-fri2 BSP layer
+======================================================
+
+The meta-fri2 layer makes use of the proprietary Intel EMGD userspace
+drivers when building the "fri2" machine (but not when building the
+"fri2-noemgd" machine).
+
+As mentioned in Section I, you need to add the line:
+
+  EMGD_LICENSE = "yes"
+
+to the local.conf file in order for the build to succeed.
+
+The fri2 BSP EMGD_LICENSE default setting causes the build to fail in
+order to prevent users from inadvertently creating and possibly
+distributing images containing the non-free EMGD package.  Setting the
+EMGD_LICENSE variable as shown above essentially tells the build
+system that you're OK with the fact that the non-free EMGD package
+will be installed in the image.
+
+Once you've done a build, you can examine the EMGD license(s) in the
+IEMGD_HEAD_Linux/License directory of the emgd-driver-bin work
+directory of the build.
+
+Alternatively, you can examine the licenses before building by
+downloading the EMGD 1.8 Driver and looking at the licenses in the
+downloaded tarball.
+
+Here is the current link to the URL from which it can be downloaded:
+
+http://edc.intel.com/Software/Downloads/EMGD/
+
+In the Download Now tab, select:
+
+Intel® architecture-based product: Linux Tar Ball
+Operating System: MeeGo* 1.2 IVI Linux* (kernel 2.6.37, X.server 1.9, Mesa 7.9)
+
+That will give you a large .tgz file:
+
+Lin_EMGD_1_8_RC_2032.tgz
+
+Extract the files in the tar file, which will in turn give you a
+directory named IEMGD_HEAD_Linux.
+
+The applicable Licenses are contained in the License directory under
+IEMGD_HEAD_Linux.
 
 
 III. Booting the images in /binary
@@ -57,7 +132,7 @@ 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=poky-image-sato-live-fri2-20101207053738.hddimg of=/dev/sdf
+# dd if=core-image-sato-fri2-20101207053738.hddimg of=/dev/sdf
 # sync
 # eject /dev/sdf
 
-- 
1.7.0.4

Re: [PATCH 2/9] meta-crownbay: new recipe for emgd 1.8 driver binaries

[Saul Wold]

On 08/20/2011 08:26 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> This adds a new recipe for the emgd 1.8 driver binaries.
>
> The emgd-driver-bin recipe now automatically downloads and installs
> EMGD using the new click-through-free tarball, but since the binaries
> still fall under a non-free license, we need to prevent it from being
> accidentally installed in an image.
>
> We therefore make sure it's labeled with 'EMGD_LICENSE'.  In order to
> build an image that contains EMGD, the user now needs to add a
> 'EMGD_LICENSE = "yes"' line to local.conf.
>
> Signed-off-by: Tom Zanussi<tom.zanussi@intel.com>
> ---
>   .../xorg-xserver/emgd-driver-bin_1.8.bb            |   46 ++++++++++++++++++++
>   1 files changed, 46 insertions(+), 0 deletions(-)
>   create mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
>
> diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
> new file mode 100644
> index 0000000..be19e5e
> --- /dev/null
> +++ b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
> @@ -0,0 +1,46 @@
> +SUMMARY = "EMGD 1.8 xserver binaries"
> +DESCRIPTION = "EMGD 1.8 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 'commercial' and you need to add COMMERCIAL_LICENSE \
> += \"\" in order to enable it in a build."

This DESCRIPTION does not match the implementation, I want to talk with 
Richard about adding another way to exclude commercially licensed 
recipes.  We can talk on Monday about this further.

Thanks
	Sau!


> +LICENSE = "Intel-binary-only"
> +PR = "r0"
> +
> +EMGD_LICDIR = "IEMGD_HEAD_Linux/License"
> +EMGD_RPMDIR = "IEMGD_HEAD_Linux/MeeGo1.2"
> +
> +LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LICDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
> +
> +SRC_URI = "http://edc.intel.com/App_Shared/Downloads/Lin_EMGD_1_8_RC_2032.tgz"
> +
> +FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers"
> +FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
> +
> +S = "${WORKDIR}/${EMGD_RPMDIR}"
> +
> +do_install () {
> +    rpm2cpio.sh ${S}/emgd-bin*.rpm | cpio -id
> +
> +    install -d -m 0755                    ${D}/${libdir}/dri
> +    install -d -m 0755                    ${D}/${libdir}/xorg/modules/drivers
> +    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/
> +
> +    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
> +}
> +
> +LEAD_SONAME = "libEGL.so"
> +
> +addtask check_emgd_license before do_fetch
> +
> +python do_check_emgd_license() {
> +    pn = bb.data.getVar('PN', d, 1)
> +    emgd_license = bb.data.getVar('EMGD_LICENSE', d, 1)
> +    if not emgd_license or not emgd_license.lower() == "yes":
> +        bb.debug(1, "Skipping %s because it has a non-free license" % pn)
> +        raise bb.parse.SkipPackage("because it requires EMGD_LICENSE = \"yes\" in local.conf to ship")
> +}

Re: [PATCH 2/9] meta-crownbay: new recipe for emgd 1.8 driver binaries

[Tom Zanussi]

On Sat, 2011-08-20 at 10:45 -0700, Saul Wold wrote:
> On 08/20/2011 08:26 AM, tom.zanussi@intel.com wrote:
> > From: Tom Zanussi<tom.zanussi@intel.com>
> >
> > This adds a new recipe for the emgd 1.8 driver binaries.
> >
> > The emgd-driver-bin recipe now automatically downloads and installs
> > EMGD using the new click-through-free tarball, but since the binaries
> > still fall under a non-free license, we need to prevent it from being
> > accidentally installed in an image.
> >
> > We therefore make sure it's labeled with 'EMGD_LICENSE'.  In order to
> > build an image that contains EMGD, the user now needs to add a
> > 'EMGD_LICENSE = "yes"' line to local.conf.
> >
> > Signed-off-by: Tom Zanussi<tom.zanussi@intel.com>
> > ---
> >   .../xorg-xserver/emgd-driver-bin_1.8.bb            |   46 ++++++++++++++++++++
> >   1 files changed, 46 insertions(+), 0 deletions(-)
> >   create mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
> >
> > diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
> > new file mode 100644
> > index 0000000..be19e5e
> > --- /dev/null
> > +++ b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
> > @@ -0,0 +1,46 @@
> > +SUMMARY = "EMGD 1.8 xserver binaries"
> > +DESCRIPTION = "EMGD 1.8 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 'commercial' and you need to add COMMERCIAL_LICENSE \
> > += \"\" in order to enable it in a build."
> 
> This DESCRIPTION does not match the implementation, I want to talk with 
> Richard about adding another way to exclude commercially licensed 
> recipes.  We can talk on Monday about this further.
> 

Ah, yes, missed that.  OK, I won't bother to fix it then if you're going
to figure out a better way.

Note that I added an item related to this for 1.2:

https://wiki.yoctoproject.org/wiki/Yocto_Project_Unscheduled_Feature_List

"Provide a click through license mechanism"

I do need to get this patchset merged soon, though, as there are other
people waiting for it and it's blocking some bugs from being closed out.
So if it's going to end up in a quagmire, I can just use the same method
as 1.6 emgd and completely route around the issue for now (but I'll wait
for a final word on it from you first) until it gets addressed in 1.2
the task above...

Tom

> Thanks
> 	Sau!
> 
> 
> > +LICENSE = "Intel-binary-only"
> > +PR = "r0"
> > +
> > +EMGD_LICDIR = "IEMGD_HEAD_Linux/License"
> > +EMGD_RPMDIR = "IEMGD_HEAD_Linux/MeeGo1.2"
> > +
> > +LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LICDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
> > +
> > +SRC_URI = "http://edc.intel.com/App_Shared/Downloads/Lin_EMGD_1_8_RC_2032.tgz"
> > +
> > +FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers"
> > +FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
> > +
> > +S = "${WORKDIR}/${EMGD_RPMDIR}"
> > +
> > +do_install () {
> > +    rpm2cpio.sh ${S}/emgd-bin*.rpm | cpio -id
> > +
> > +    install -d -m 0755                    ${D}/${libdir}/dri
> > +    install -d -m 0755                    ${D}/${libdir}/xorg/modules/drivers
> > +    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/
> > +
> > +    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
> > +}
> > +
> > +LEAD_SONAME = "libEGL.so"
> > +
> > +addtask check_emgd_license before do_fetch
> > +
> > +python do_check_emgd_license() {
> > +    pn = bb.data.getVar('PN', d, 1)
> > +    emgd_license = bb.data.getVar('EMGD_LICENSE', d, 1)
> > +    if not emgd_license or not emgd_license.lower() == "yes":
> > +        bb.debug(1, "Skipping %s because it has a non-free license" % pn)
> > +        raise bb.parse.SkipPackage("because it requires EMGD_LICENSE = \"yes\" in local.conf to ship")
> > +}
> 

Re: [PATCH 1/9] meta-crownbay: switch to linux-yocto 3.0 kernel

[Bruce Ashfield]

On 11-08-20 11:26 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> Switch crownbay and crownbay-noemgd to the 3.0 kernel, lock it down,
> and update kernel SRCREVs.
>
> Signed-off-by: Tom Zanussi<tom.zanussi@intel.com>
> ---
>   meta-crownbay/conf/machine/crownbay-noemgd.conf    |    2 ++
>   meta-crownbay/conf/machine/crownbay.conf           |    2 ++
>   .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   15 +++++++++++++++
>   3 files changed, 19 insertions(+), 0 deletions(-)
>   create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
>
> diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
> index 0219bd1..0a82b54 100644
> --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
> +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
> @@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
>   KERNEL_IMAGETYPE = "bzImage"
>
>   PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> +PREFERRED_VERSION_linux-yocto = "3.0+git%"

Did you want to make all these:

PREFERRED_VERSION_linux-yocto = "3.0%"

Since that will match 3.0.1, 3.0.2 ... etc. That's what I changed
the other machines to, and was the outcome of the version number
discussion on the oe-core list.

Cheers,

Bruce

> +
>   PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
>   PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
>   PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
> diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
> index 323c8c1..b4ea4b4 100644
> --- a/meta-crownbay/conf/machine/crownbay.conf
> +++ b/meta-crownbay/conf/machine/crownbay.conf
> @@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
>   KERNEL_IMAGETYPE = "bzImage"
>
>   PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> +PREFERRED_VERSION_linux-yocto = "3.0+git%"
> +
>   PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
>   PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
>   PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
> diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
> new file mode 100644
> index 0000000..c9aef72
> --- /dev/null
> +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
> @@ -0,0 +1,15 @@
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +
> +COMPATIBLE_MACHINE_crownbay = "crownbay"
> +KMACHINE_crownbay  = "yocto/standard/crownbay"
> +KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
> +
> +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
> +KMACHINE_crownbay-noemgd  = "yocto/standard/crownbay"
> +KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
> +
> +SRCREV_machine_pn-linux-yocto_crownbay ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
> +SRCREV_meta_pn-linux-yocto_crownbay ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
> +
> +SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
> +SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"

Re: [PATCH 1/9] meta-crownbay: switch to linux-yocto 3.0 kernel

[Tom Zanussi]

On Sat, 2011-08-20 at 20:26 -0700, Bruce Ashfield wrote:
> On 11-08-20 11:26 AM, tom.zanussi@intel.com wrote:
> > From: Tom Zanussi<tom.zanussi@intel.com>
> >
> > Switch crownbay and crownbay-noemgd to the 3.0 kernel, lock it down,
> > and update kernel SRCREVs.
> >
> > Signed-off-by: Tom Zanussi<tom.zanussi@intel.com>
> > ---
> >   meta-crownbay/conf/machine/crownbay-noemgd.conf    |    2 ++
> >   meta-crownbay/conf/machine/crownbay.conf           |    2 ++
> >   .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   15 +++++++++++++++
> >   3 files changed, 19 insertions(+), 0 deletions(-)
> >   create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
> >
> > diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
> > index 0219bd1..0a82b54 100644
> > --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
> > +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
> > @@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
> >   KERNEL_IMAGETYPE = "bzImage"
> >
> >   PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> > +PREFERRED_VERSION_linux-yocto = "3.0+git%"
> 
> Did you want to make all these:
> 
> PREFERRED_VERSION_linux-yocto = "3.0%"
> 
> Since that will match 3.0.1, 3.0.2 ... etc. That's what I changed
> the other machines to, and was the outcome of the version number
> discussion on the oe-core list.
> 

Yeah, I updated the others yesterday and will do the same for these when
I respin the patchset again...

Thanks for reminding me,

Tom

> Cheers,
> 
> Bruce
> 
> > +
> >   PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
> >   PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> >   PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
> > diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
> > index 323c8c1..b4ea4b4 100644
> > --- a/meta-crownbay/conf/machine/crownbay.conf
> > +++ b/meta-crownbay/conf/machine/crownbay.conf
> > @@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
> >   KERNEL_IMAGETYPE = "bzImage"
> >
> >   PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> > +PREFERRED_VERSION_linux-yocto = "3.0+git%"
> > +
> >   PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
> >   PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> >   PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
> > diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
> > new file mode 100644
> > index 0000000..c9aef72
> > --- /dev/null
> > +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
> > @@ -0,0 +1,15 @@
> > +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> > +
> > +COMPATIBLE_MACHINE_crownbay = "crownbay"
> > +KMACHINE_crownbay  = "yocto/standard/crownbay"
> > +KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
> > +
> > +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
> > +KMACHINE_crownbay-noemgd  = "yocto/standard/crownbay"
> > +KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
> > +
> > +SRCREV_machine_pn-linux-yocto_crownbay ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
> > +SRCREV_meta_pn-linux-yocto_crownbay ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
> > +
> > +SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
> > +SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
>