emgd recipe misc fixes
cover emgd recipe misc fixes
From: Nitin A Kamble <[email protected]>
Here are the fixes related to the emgd recipe. These are verified with crownbay BSP with the latest master branches.
Thanks,
Nitin
The following changes since commit 574d10a3a2040ff685b74f9d4034f045d0191e5b:
meta-intel: move emgd-driver-bin_1.14 to xorg-driver/ (2012-09-15 15:02:43 -0500)
are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/work
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/work
Nitin A Kamble (2):
emgd-driver-bin: Fix package naming issue
emgd-driver-bin: avoid rebuilding issue of the recipe
.../xorg-driver/emgd-driver-bin_1.14.bb | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.3.4
PATCH 1/2 emgd-driver-bin: Fix package naming issue
From: Nitin A Kamble <[email protected]>
emgd-driver-bin is generating rpm package with name libegl1. This name clashes with a package with sanme name from mesa-dri recipe. This name clash blocks installation of emgd user land binaries in the image. And due to missing emgd user land components X fails to start on BSPs like crownbay.
Fix this problem by specifying package names in the recipe with the PKG_ vars.
This fixes bug: [YOCTO #3063]
--- .../xorg-driver/emgd-driver-bin_1.14.bb | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb +7 -1
@@ -7,7 +7,7 @@ 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_FLAGS = "license_${PN}_${PV}" -PR = "r1" +PR = "r2" EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License" EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
@@ -23,6 +23,12 @@ SRC_URI = "https://edc.intel.com/Download.aspx?id=6190;downloadfilename=LIN_IEMG SRC_URI[md5sum] = "733a7f237ffce21238ce2c9956df4fd6" SRC_URI[sha256sum] = "bcdc333b5edbda7c746a83ef821ded4a0ca55ead30980e4e3680cdb6469f45a2" +# make sure generated rpm packages get non conflicting names +PKG_${PN} = "emgd-driver" +PKG_${PN}-dev = "emgd-driver-dev" +PKG_${PN}-dbg = "emgd-driver-dbg" +PKG_${PN}-doc = "emgd-driver-doc" + # These are closed binaries generated elsewhere so don't check ldflags INSANE_SKIP_${PN} = "ldflags"
Signature · 1 line
1.7.3.4
PATCH 2/2 emgd-driver-bin: avoid rebuilding issue of the recipe
From: Nitin A Kamble <[email protected]>
This avoids errors like this:
| cpio: ./usr/lib/libgstvabuffer.so.0 not created: newer or same age version exists
| install: cannot stat `/srv/home/nitin/builds/build-crownbay/tmp/work/core2-poky-linux/emgd-driver-bin-1.14-r2/IEMGD_HEAD_Linux/MeeGo1.2/usr/lib/libGLES_CM.so': No such file or directory
--- .../xorg-driver/emgd-driver-bin_1.14.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb +4 -1
@@ -7,7 +7,7 @@ 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_FLAGS = "license_${PN}_${PV}" -PR = "r2" +PR = "r3" EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License" EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
@@ -38,6 +38,9 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug $ S = "${WORKDIR}/${EMGD_RPM_DIR}" do_install () { + # cleanup previous files if any + rm -rf usr + # A gstreamer VA buffer library rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-vabuffer*.rpm | cpio -id
Signature · 1 line
1.7.3.4
Re: [PATCH 2/2] emgd-driver-bin: avoid rebuilding issue of the recipe
Quoted 25 lines · On 09/16/2012 03:27 PM, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
This avoids errors like this:
| cpio:./usr/lib/libgstvabuffer.so.0not created: newer or same age version exists
| install: cannot stat `/srv/home/nitin/builds/build-crownbay/tmp/work/core2-poky-linux/emgd-driver-bin-1.14-r2/IEMGD_HEAD_Linux/MeeGo1.2/usr/lib/libGLES_CM.so': No such file or directorySigned-off-by Nitin A Kamble <[email protected]>--- .../xorg-driver/emgd-driver-bin_1.14.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb +1
-1@@ -7,7 +7,7 @@ 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_FLAGS = "license_${PN}_${PV}" -PR = "r2" +PR = "r3" EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License" EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug $ · line 43
Quoted 6 lines
common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb +3
-0@@ -38,6 +38,9 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug $ S = "${WORKDIR}/${EMGD_RPM_DIR}" do_install () { + # cleanup previous files if any + rm -rf usr +
This looks like a hack. If nothing has changed, this shouldn't be an issue. If something has changed, we should triggering a new build anyway. What's actually going on here?
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Re: [PATCH 1/2] emgd-driver-bin: Fix package naming issue
In reply to [email protected]Quoted 8 lines · On Sun, 2012-09-16 at 15:27 -0700, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
emgd-driver-bin is generating rpm package with name libegl1. This name clashes with a package with sanme name from mesa-dri recipe. This name clash blocks installation of emgd user land binaries in the image. And due to missing emgd user land components X fails to start on BSPs like crownbay.
Quoted 4 lines
Fix this problem by specifying package names in the recipe with the
PKG_vars.This fixes bug: [YOCTO #3063]
OK, I was finally able to get a build that had X working and was able to test this and pull it into meta-intel/master.
Thanks,
Tom
Quoted 32 lines
Signed-off-by Nitin A Kamble <[email protected]>--- .../xorg-driver/emgd-driver-bin_1.14.bb | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb +7
-1@@ -7,7 +7,7 @@ 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_FLAGS = "license_${PN}_${PV}" -PR = "r1" +PR = "r2" EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License" EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"@@ -23,6 +23,12 @@ SRC_URI = "https://edc.intel.com/Download.aspx?id=6190;downloadfilename=LIN_IEMG SRC_URI[md5sum] = "733a7f237ffce21238ce2c9956df4fd6" SRC_URI[sha256sum] = "bcdc333b5edbda7c746a83ef821ded4a0ca55ead30980e4e3680cdb6469f45a2" +# make sure generated rpm packages get non conflicting names +PKG_${PN} = "emgd-driver" +PKG_${PN}-dev = "emgd-driver-dev" +PKG_${PN}-dbg = "emgd-driver-dbg" +PKG_${PN}-doc = "emgd-driver-doc" + # These are closed binaries generated elsewhere so don't check ldflags INSANE_SKIP_${PN} = "ldflags"
Quoted 4 lines · On Sun, 2012-09-16 at 15:27 -0700, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
Here are the fixes related to the emgd recipe. These are verified with crownbay BSP with the latest master branches.
Sorry, but I'm still not able to verify this with the latest poky and meta-intel master (no X due to missing /usr/bin/Xorg).
poky/master: 913944d904266bf90af0cad94b4f0fb3652bd29d meta-intel/master: 574d10a3a2040ff685b74f9d4034f045d0191e5b
Tom
Quoted 18 lines
Thanks,
NitinThe following changes since commit
574d10a3a2040ff685b74f9d4034f045d0191e5b:meta-intel: move emgd-driver-bin_1.14 to xorg-driver/ (2012-09-15 15:02:43 -0500)
are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contribnitin/work
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/workNitin A Kamble (2):
emgd-driver-bin: Fix package naming issue
emgd-driver-bin: avoid rebuilding issue of the recipe.../xorg-driver/emgd-driver-bin_1.14.bb | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)