Skip to contentSkip to conversation

meta-intel: emgd updates

PATCH New [email protected] 1 participant 3 messages Sep 27, 2011

lore
Share & tools
lore
#0 lore raw

cover meta-intel: emgd updates

From: Tom Zanussi <[email protected]>

This small patchset fixes a typo and some QA warnings in emgd-driver-bin_1.8.

It also removes obsolete emgd-1.6 support.

The following changes since commit d286d43b6552dc2abffe7888d726d8b08f77b96c:
Tom Zanussi (1):
meta-intel: update SRCREVs

are available in the git repository at:

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

Tom Zanussi (2):
meta-intel: fix symlink typo and QA checks in emgd-driver-bin
meta-crownbay: remove emgd-1.6

 .../xorg-xserver/emgd-driver-bin_1.8.bb            |    8 ++++--
 .../xorg-xserver/emgd-driver-bin_1.6.bb            |   25 --------------------
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.6/.gitignore
 delete mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.6.bb
#1 lore raw

PATCH 1/2 meta-intel: fix symlink typo and QA checks in emgd-driver-bin

From: Tom Zanussi <[email protected]>

There was a typo in the libEGL.so symlink creation - this fixes it.

It also adds a missing symlink for scope services, and fixes the QA warnings for 'non-dev package contains symlink .so...'.

---
 .../xorg-xserver/emgd-driver-bin_1.8.bb            |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb +5 -3
index 8f309c9..88e8a55 100644
@@ -6,7 +6,7 @@ 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 = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://${WORKDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
 
@@ -15,7 +15,8 @@ FILESPATH = "${FILE_DIRNAME}/emgd-driver-bin-1.8"
 SRC_URI = "file://lib \
            file://License.txt"
 
-FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers ${libdir}/*.so"
+FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers"
+FILES_${PN}-dev += "${libdir}/*.so"
 FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
 
 S = "${WORKDIR}"
@@ -27,9 +28,10 @@ do_install () {
     install -m 0755 ${S}/lib/dri/*        ${D}${libdir}/dri/
     install -m 0755 ${S}/lib/xorg/modules/drivers/* ${D}${libdir}/xorg/modules/drivers/
 
-    ln -sf libEGl.so.1                    ${D}${libdir}/libEGl.so
+    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
#2 lore raw

PATCH 2/2 meta-crownbay: remove emgd-1.6

From: Tom Zanussi <[email protected]>

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

---
 .../xorg-xserver/emgd-driver-bin_1.8.bb            |    2 +-
 .../xorg-xserver/emgd-driver-bin_1.6.bb            |   25 --------------------
 2 files changed, 1 insertions(+), 26 deletions(-)
 delete mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.6/.gitignore
 delete mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.6.bb
common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb +1 -1
index 88e8a55..8dc43ea 100644
@@ -6,7 +6,7 @@ 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 = "r1"
+PR = "r7"
 
 LIC_FILES_CHKSUM = "file://${WORKDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
 
meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.6/.gitignore deleted +0 -0
deleted file mode 100644
index e69de29..0000000
meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.6.bb deleted +0 -25
deleted file mode 100644
index 4d5d1e2..0000000
@@ -1,25 +0,0 @@
-SUMMARY = "EMGD 1.6 xserver binaries"
-DESCRIPTION = "EMGD 1.6 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"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
-PR = "r0"
-
-FILESPATH = "${FILE_DIRNAME}/emgd-driver-bin-1.6"
-
-FILES_${PN} = "${libdir}/*.so.* ${libdir}/dri ${libdir}/xorg/modules/drivers"
-
-SRC_URI = "file://lib \
-           file://License.txt"
-
-S = "${WORKDIR}"
-
-do_install () {
-	install -d -m 0755 ${D}/${libdir}/dri ${D}/${libdir}/xorg/modules/drivers
-
-	cp -PR	${S}/lib/lib*					${D}${libdir}
-	install -m 0755	${S}/lib/xorg/modules/drivers/*		${D}${libdir}/xorg/modules/drivers/
-	install -m 0755	${S}/lib/dri/*				${D}${libdir}/dri/
-}
-
-LEAD_SONAME = "libEGL.so"
Signature · 1 line
1.7.0.4