Skip to contentSkip to conversation

emgd-1.10: new recipe

PATCH In review [email protected] 2 participants 9 messages Jan 25, 2012

lore
Share & tools
lore
#0 lore raw

cover emgd-1.10: new recipe

From: Tom Zanussi <[email protected]>

This patchset adds support for emgd-1.10. This version relies on a new licensing mechanism called LICENSE_FLAGS.

The LICENSE_FLAGS implementation provides the mechanism needed for this new emgd recipe to be automatically downloaded from the emgd site and used by the recipe rather than using the manual-copy method required by the emgd-1.8 and previous recipes.

In order to allow emgd-1.10 to be built, however, the emgd license string, "license_emgd-driver-bin_1.10" must be added to the LICENSE_FLAGS_WHITELIST variable in local.conf e.g.:

LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10"

This patchset also removes the 1.8 recipe in the process.

The following changes since commit 4f1ca13b5a39f27bd41c0c7d9f2b163c3f9e8718:
Joshua Lock (1):
n450-audio: drop this machine specific recipe in favour of alsa-state

are available in the git repository at:

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

Tom Zanussi (6):
meta-intel: new recipe for emgd 1.10 driver
meta-intel: remove emgd-1.8
meta-fri2: remove PREFERRED_VERSION for emgd-driver-bin
meta-crownbay: remove PREFERRED_VERSION for emgd-driver-bin
meta-crownbay: update README
meta-fri2: update README

 .../xorg-xserver/emgd-driver-bin_1.10.bb           |   89 ++++++++++++++++++
 .../xorg-xserver/emgd-driver-bin_1.8.bb            |   39 --------
 meta-crownbay/README                               |   97 +++-----------------
 meta-crownbay/conf/machine/crownbay.conf           |    1 -
 meta-fri2/README                                   |   86 +++---------------
 meta-fri2/conf/machine/fri2.conf                   |    1 -
 6 files changed, 113 insertions(+), 200 deletions(-)
 delete mode 100644 common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/.gitignore
 create mode 100644 common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.10.bb
 delete mode 100644 common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
#1 lore raw

PATCH 1/6 meta-intel: new recipe for emgd 1.10 driver

From: Tom Zanussi <[email protected]>

This adds a new recipe for the emgd 1.10 driver.

---
 .../xorg-xserver/emgd-driver-bin_1.10.bb           |   89 ++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 deletions(-)
 create mode 100644 common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.10.bb
common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.10.bb new file +89 -0
new file mode 100644
index 0000000..28fd0c1
@@ -0,0 +1,89 @@
+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 = "r0"
+
+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"
+
+FILES_${PN} += "${libdir}/dri ${libdir}/gstreamer-0.10 ${libdir}/xorg/modules/drivers"
+FILES_${PN}-dev += "${libdir}/dri ${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"
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/6 meta-intel: remove emgd-1.8

From: Tom Zanussi <[email protected]>

emgd-1.8 is now obsoleted by emgd-1.10, so remove support for it.

---
 .../xorg-xserver/emgd-driver-bin_1.8.bb            |   39 --------------------
 1 files changed, 0 insertions(+), 39 deletions(-)
 delete mode 100644 common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/.gitignore
 delete mode 100644 common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/.gitignore deleted +0 -0
deleted file mode 100644
index e69de29..0000000
common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb deleted +0 -39
deleted file mode 100644
index bb98962..0000000
@@ -1,39 +0,0 @@
-SUMMARY = "EMGD 1.8 xserver binaries"
-DESCRIPTION = "EMGD 1.8 includes some userspace binaries that use non-free \
-licensing.  Intel Open Source Technology Center unfortunately has no power \
-to change that, but tries to make their use as painless as possible.  Please \
-see the README in meta-crownbay/ for instructions on the (simple) manual \
-steps necessary to make the necessary binaries available to this recipe.  \
-Please do that before building an image."
-LICENSE = "Intel-binary-only"
-PR = "r8"
-
-LIC_FILES_CHKSUM = "file://${WORKDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
-
-FILESPATH = "${FILE_DIRNAME}/emgd-driver-bin-1.8"
-
-SRC_URI = "file://lib \
-           file://License.txt"
-
-FILES_${PN} += "${libdir}/dri ${libdir}/gstreamer-0.10 ${libdir}/xorg/modules/drivers"
-FILES_${PN}-dev += "${libdir}/*.so"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
-
-S = "${WORKDIR}"
-
-do_install () {
-    install -d -m 0755                              ${D}/${libdir}/dri
-    install -d -m 0755                              ${D}/${libdir}/gstreamer-0.10
-    install -d -m 0755                              ${D}/${libdir}/xorg/modules/drivers
-    install -m 0755 ${S}/lib/*.so.*                 ${D}${libdir}/
-    install -m 0755 ${S}/lib/dri/*                  ${D}${libdir}/dri/
-    install -m 0755 ${S}/lib/gstreamer-0.10/*       ${D}${libdir}/gstreamer-0.10/
-    install -m 0755 ${S}/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
-    ln -sf libEMGDScopeServices.so.1.5.15.3226      ${D}${libdir}/libPVRScopeServices.so
-}
-
-LEAD_SONAME = "libEGL.so"
Signature · 1 line
1.7.0.4
#3 lore raw

PATCH 3/6 meta-fri2: remove PREFERRED_VERSION for emgd-driver-bin

In reply to [email protected]

From: Tom Zanussi <[email protected]>

fri2 specifies a preferred version of 1.8 for emgd, but there's really no reason to do that at this point - it should be able to use the new 1.10 version.

---
 meta-fri2/conf/machine/fri2.conf |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
meta-fri2/conf/machine/fri2.conf +0 -1
index 9ae4287..c69aa40 100644
@@ -17,7 +17,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
 PREFERRED_VERSION_mesa-dri ?= "7.11"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
Signature · 1 line
1.7.0.4
Acked-by on v1 3/6
#4 lore raw

Re: [PATCH 3/6] meta-fri2: remove PREFERRED_VERSION for emgd-driver-bin

Quoted 7 lines · On 01/24/2012 04:00 PM, [email protected] wrote:

From: Tom Zanussi <[email protected]>

fri2 specifies a preferred version of 1.8 for emgd, but there's really no reason to do that at this point - it should be able to use the new 1.10 version.

Quoted 16 lines
---
 meta-fri2/conf/machine/fri2.conf |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
meta-fri2/conf/machine/fri2.conf +0 -1
index 9ae4287..c69aa40 100644
@@ -17,7 +17,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
 PREFERRED_VERSION_mesa-dri ?= "7.11"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
#5 lore raw

PATCH 4/6 meta-crownbay: remove PREFERRED_VERSION for emgd-driver-bin

In reply to [email protected]

From: Tom Zanussi <[email protected]>

crownbay specifies a preferred version of 1.8 for emgd, but there's really no reason to do that at this point - it should be able to use the new 1.10 version.

---
 meta-crownbay/conf/machine/crownbay.conf |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
meta-crownbay/conf/machine/crownbay.conf +0 -1
index 1bf3bdd..15bfd52 100644
@@ -14,7 +14,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
 PREFERRED_VERSION_mesa-dri ?= "7.11"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 APPEND += "video=vesafb vga=0x318"
 
Signature · 1 line
1.7.0.4
#6 lore raw

PATCH 5/6 meta-crownbay: update README

In reply to [email protected]

From: Tom Zanussi <[email protected]>

The new emgd-driver-bin_1.10 recipe no longer requires manually extracting and installing emgd binaries, so remove the section that deals with that.

It does require a new LICENSE_FLAGS_WHITELIST entry in local.conf, so add instructions detailing that.

---
 meta-crownbay/README |   97 ++++++-------------------------------------------
 1 files changed, 12 insertions(+), 85 deletions(-)
meta-crownbay/README +12 -85
index 65289f7..b56c79a 100644
@@ -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.8 Driver.
+Embedded Media and Graphics Driver (EMGD) 1.10 Driver.
 
 
 Dependencies
@@ -41,8 +41,7 @@ Table of Contents
 =================
 
   I. Building the meta-crownbay BSP layer
- II. Special notes for building the meta-crownbay BSP layer
-III. Booting the images in /binary
+ II. Booting the images in /binary
 
 
 I. Building the meta-crownbay BSP layer
@@ -64,7 +63,7 @@ common metadata shared between BSPs) 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.8 graphics driver, while the one prefixed
+Intel-proprietary EMGD 1.10 graphics driver, while the one prefixed
 with 'crownbay-noemgd' does not.
 
 If you want to enable the layer that supports EMGD graphics add the
@@ -72,6 +71,13 @@ following to the local.conf file:
 
   MACHINE ?= "crownbay"
 
+The 'crownbay' machine includes the emgd-driver-bin package, which has
+a proprietary license that must be whitelisted by adding the string
+"license_emgd-driver-bin_1.10" to the LICENSE_FLAGS_WHITELIST variable
+in your local.conf.  For example:
+
+  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10"
+
 If you want to enable the layer that does not support EMGD graphics
 add the following to the local.conf file:
 
@@ -97,87 +103,8 @@ 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
-==========================================================
-
-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 meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
-directory, and you can ignore the rest of this section.
-
-If you didn't get the BSP from the 'BSP Downloads' section of the
-Yocto website, 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.
-
-The following subsection describes that process in detail.
-
-
-Downloading and extracting the binaries using the EMGD Linux tarball
---------------------------------------------------------------------
-
-The first step of the process is to download the EMGD 1.8 Driver.
-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 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-2032-1.6.i586.rpm > emgd-bin-2032-1.6.i586.cpio
-$ mkdir extracted; cd extracted
-$ cpio -idv < ../emgd-bin-2032-1.6.i586.cpio
-
-You can now copy the xorg-xserver binaries to the emgd-driver-bin-1.8
-directory in meta-intel/common:
-
-$ cp -a usr/lib meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
-
-You also need to copy the IEMGD License.txt file to the same directory:
-
-$ cp IEMGD_HEAD_Linux/License/License.txt meta-intel/common/recipes/xorg-xserver/emgd-driver-bin-1.8
-
-Finally, you need to extract and copy the video plugins to the
-emgd-driver-bin-1.8 directory in meta-intel/common:
- 
-$ cd IEMGD_HEAD_Linux/common/video_plugin
-$ rpm2cpio gst-plugins-mixvideo-0.10.30-1.i586.rpm > gst-plugins-mixvideo-0.10.30-1.i586.cpio
-$ rpm2cpio gst-plugins-va-0.10.7MFLD-1.i586.rpm > gst-plugins-va-0.10.7MFLD-1.i586.cpio
-$ rpm2cpio gst-vabuffer-0.10.5MFLD-1.i586.rpm > gst-vabuffer-0.10.5MFLD-1.i586.cpio
-$ rpm2cpio mixcommon-0.1.9-1.i586.rpm > mixcommon-0.1.9-1.i586.cpio
-$ rpm2cpio mixvbp-0.1.24-1.i586.rpm > mixvbp-0.1.24-1.i586.cpio
-$ rpm2cpio mixvideo-0.1.31-1.i586.rpm > mixvideo-0.1.31-1.i586.cpio
-$ mkdir extracted; cd extracted
-$ cpio -idv < ../gst-plugins-mixvideo-0.10.30-1.i586.cpio
-$ cpio -idv < ../gst-plugins-va-0.10.7MFLD-1.i586.cpio
-$ cpio -idv < ../gst-vabuffer-0.10.5MFLD-1.i586.cpio
-$ cpio -idv < ../mixcommon-0.1.9-1.i586.cpio
-$ cpio -idv < ../mixvbp-0.1.24-1.i586.cpio
-$ cpio -idv < ../mixvideo-0.1.31-1.i586.cpio
-$ rm usr/lib/*.so.0
-$ cp -a usr/lib meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
-
-At this point, you should be able to build meta-crownbay images as usual.
-
-
-III. Booting the images in /binary
-==================================
+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.
Signature · 1 line
1.7.0.4
#7 lore raw

PATCH 6/6 meta-fri2: update README

In reply to [email protected]

From: Tom Zanussi <[email protected]>

The new emgd-driver-bin_1.10 recipe no longer requires manually extracting and installing emgd binaries, so remove the section that deals with that.

It does require a new LICENSE_FLAGS_WHITELIST entry in local.conf, so add instructions detailing that.

---
 meta-fri2/README |   86 +++++++----------------------------------------------
 1 files changed, 12 insertions(+), 74 deletions(-)
meta-fri2/README +12 -74
index 2f8a5a4..df2fa87 100644
@@ -8,7 +8,7 @@ processor, plus the Intel EG20T Platform Controller Hub (Tunnel Creek
 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.
+Embedded Media and Graphics Driver (EMGD) 1.10 Driver.
 
 
 Dependencies
@@ -43,8 +43,7 @@ Table of Contents
 =================
 
   I. Building the meta-fri2 BSP layer
- II. Special notes for building the meta-fri2 BSP layer
-III. Booting the images in /binary
+ II. Booting the images in /binary
 
 
 I. Building the meta-fri2 BSP layer
@@ -66,7 +65,7 @@ between BSPs) e.g.:
 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'
+EMGD 1.10 graphics driver, while the one prefixed with 'fri2-noemgd'
 does not.
 
 If you want to enable the layer that supports EMGD graphics add the
@@ -74,6 +73,13 @@ following to the local.conf file:
 
   MACHINE ?= "fri2"
 
+The 'fri2' machine includes the emgd-driver-bin package, which has a
+proprietary license that must be whitelisted by adding the string
+"license_emgd-driver-bin_1.10" to the LICENSE_FLAGS_WHITELIST variable
+in your local.conf.  For example:
+
+  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10"
+
 If you want to enable the layer that does not support EMGD graphics
 add the following to the local.conf file:
 
@@ -99,76 +105,8 @@ 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).  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
-meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
-directory, and you can ignore the rest of this section.
-
-If you didn't get the BSP from the 'BSP Downloads' section of the
-Yocto website, 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-fri2 layer.
-
-The following subsection describes that process in detail.
-
-
-Downloading and extracting the binaries using the EMGD Linux tarball
---------------------------------------------------------------------
-
-The first step of the process is to download the EMGD 1.8 Driver.
-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 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-2032-1.6.i586.rpm > emgd-bin-2032-1.6.i586.cpio
-$ mkdir extracted; cd extracted
-$ cpio -idv < ../emgd-bin-2032-1.6.i586.cpio
-
-Finally, you can copy the xorg-xserver binaries to the
-emgd-driver-bin-1.8 directory in meta-intel/common:
-
-$ cp -a usr/lib meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
-
-You also need to copy the IEMGD License.txt file to the same directory:
-
-$ cp IEMGD_HEAD_Linux/License/License.txt meta-intel/common/recipes/xorg-xserver/emgd-driver-bin-1.8
-
-Additionally, you should remove the following unused file from the
-emgd binaries in order to avoid a packaging error at build-time:
-
-$ rm meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/lib/dri/emgd_drv_video.so
-
-Finally, you need to remove the following file:
-
-$ rm meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/lib/dri/emgd_drv_video.so
-
-At this point, you should be able to build meta-fri2 images as usual.
-
-
-III. Booting the images in /binary
-==================================
+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.
Signature · 1 line
1.7.0.4
Acked-by on v1 6/6
#8 lore raw

Re: [PATCH 6/6] meta-fri2: update README

Quoted 10 lines · On 01/24/2012 04:00 PM, [email protected] wrote:

From: Tom Zanussi <[email protected]>

The new emgd-driver-bin_1.10 recipe no longer requires manually extracting and installing emgd binaries, so remove the section that deals with that.

It does require a new LICENSE_FLAGS_WHITELIST entry in local.conf, so add instructions detailing that.

Quoted 129 lines
---
 meta-fri2/README |   86 +++++++----------------------------------------------
 1 files changed, 12 insertions(+), 74 deletions(-)
meta-fri2/README +12 -74
index 2f8a5a4..df2fa87 100644
@@ -8,7 +8,7 @@ processor, plus the Intel EG20T Platform Controller Hub (Tunnel Creek
 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.
+Embedded Media and Graphics Driver (EMGD) 1.10 Driver.
 
 
 Dependencies
@@ -43,8 +43,7 @@ Table of Contents
 =================
 
   I. Building the meta-fri2 BSP layer
- II. Special notes for building the meta-fri2 BSP layer
-III. Booting the images in /binary
+ II. Booting the images in /binary
 
 
 I. Building the meta-fri2 BSP layer
@@ -66,7 +65,7 @@ between BSPs) e.g.:
 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'
+EMGD 1.10 graphics driver, while the one prefixed with 'fri2-noemgd'
 does not.
 
 If you want to enable the layer that supports EMGD graphics add the
@@ -74,6 +73,13 @@ following to the local.conf file:
 
   MACHINE ?= "fri2"
 
+The 'fri2' machine includes the emgd-driver-bin package, which has a
+proprietary license that must be whitelisted by adding the string
+"license_emgd-driver-bin_1.10" to the LICENSE_FLAGS_WHITELIST variable
+in your local.conf.  For example:
+
+  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10"
+
 If you want to enable the layer that does not support EMGD graphics
 add the following to the local.conf file:
 
@@ -99,76 +105,8 @@ 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).  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
-meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
-directory, and you can ignore the rest of this section.
-
-If you didn't get the BSP from the 'BSP Downloads' section of the
-Yocto website, 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-fri2 layer.
-
-The following subsection describes that process in detail.
-
-
-Downloading and extracting the binaries using the EMGD Linux tarball
---------------------------------------------------------------------
-
-The first step of the process is to download the EMGD 1.8 Driver.
-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 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-2032-1.6.i586.rpm > emgd-bin-2032-1.6.i586.cpio
-$ mkdir extracted; cd extracted
-$ cpio -idv < ../emgd-bin-2032-1.6.i586.cpio
-
-Finally, you can copy the xorg-xserver binaries to the
-emgd-driver-bin-1.8 directory in meta-intel/common:
-
-$ cp -a usr/lib meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
-
-You also need to copy the IEMGD License.txt file to the same directory:
-
-$ cp IEMGD_HEAD_Linux/License/License.txt meta-intel/common/recipes/xorg-xserver/emgd-driver-bin-1.8
-
-Additionally, you should remove the following unused file from the
-emgd binaries in order to avoid a packaging error at build-time:
-
-$ rm meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/lib/dri/emgd_drv_video.so
-
-Finally, you need to remove the following file:
-
-$ rm meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/lib/dri/emgd_drv_video.so
-
-At this point, you should be able to build meta-fri2 images as usual.
-
-
-III. Booting the images in /binary
-==================================
+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.
Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel