[meta-intel] [PATCH 1/1] emgd-driver-bin: remove duplicate files & fix soft links

Wed Nov 21 09:10:23 PST 2012

On Wed, 2012-11-21 at 11:07 -0600, Kamble, Nitin A wrote:
> Tom,
> It is building fine for me. I tested with this branches:
> 
> * poky.git:
> ** master: commit 66861cce918eb7ed1f16f829d652c9d7105152b7
> 
> * meta-intel.git
> ** master: commit 787d5d8c933577307d5c231f5ba3e9aa41db3aea
> 
> ** Additional commits over master:
> Nitin A Kamble (2):
>        emgd-driver-bin: remove duplicate files & fix soft links
>        qt4-x11-free: remove bbappend file
> 
> I will give it another try with the latest heads.
> 

I'm actually using Danny and only the emgd-driver-bin patch, since
master wouldn't build yesterday:

meta-yocto        = "danny1:27af23e65f63b41962a7cfddba9e9372d5212396"
meta-intel        
meta-crownbay     = "master4:c4c37e3cfb21411ffc10fe8410b2481f427ebc23"

But that should be ok with danny, I assume?

Tom

> Thanks,
> Nitin
> 
> > -----Original Message-----
> > From: Zanussi, Tom
> > Sent: Wednesday, November 21, 2012 6:22 AM
> > To: Kamble, Nitin A
> > Cc: meta-intel at yoctoproject.org; Hart, Darren
> > Subject: Re: [PATCH 1/1] emgd-driver-bin: remove duplicate files & fix soft
> > links
> > 
> > On Tue, 2012-11-20 at 13:50 -0800, nitin.a.kamble at intel.com wrote:
> > > From: Nitin A Kamble <nitin.a.kamble at intel.com>
> > >
> > > Replace all the duplicate files by soft links, and also fix targets of
> > > some of the broken soft links.
> > >
> > > Fixes [YOCTO #3257]
> > >
> > 
> > Hi Nitin,
> > 
> > I'm getting a do_rootfs error building this.
> > 
> > ERROR: Function failed: do_rootfs (see /usr/local/dev/yocto/isg-
> > test/build/tmp/work/crownbay-poky-linux/core-image-sato-1.0-
> > r0/temp/log.do_rootfs.1316 for further information)
> > ERROR: Logfile of failure stored in: /usr/local/dev/yocto/isg-
> > test/build/tmp/work/crownbay-poky-linux/core-image-sato-1.0-
> > r0/temp/log.do_rootfs.1316
> > Log data follows:
> > | DEBUG: Executing shell function do_rootfs Generating solve db for
> > | /usr/local/dev/yocto/isg-test/build/tmp/deploy/rpm/crownbay...
> > | Generating solve db for /usr/local/dev/yocto/isg-
> > test/build/tmp/deploy/rpm/core2...
> > | Generating solve db for /usr/local/dev/yocto/isg-
> > test/build/tmp/deploy/rpm/all...
> > | Generating solve db for /usr/local/dev/yocto/isg-
> > test/build/tmp/deploy/rpm/all...
> > | Processing locale-base-en-us...
> > | Processing locale-base-en-gb...
> > | Processing packagegroup-core-ssh-dropbear...
> > | Processing packagegroup-core-x11-sato-games...
> > | Processing packagegroup-core-x11-base...
> > | Processing zypper...
> > | Processing psplash...
> > | Processing packagegroup-core-boot...
> > | Processing packagegroup-base-extended...
> > | Processing rpm...
> > | Processing packagegroup-core-x11-sato...
> > | error: Failed dependencies:
> > | 	xorg-abi-video-8 is needed by emgd-driver-1.14-r3.core2
> > | ERROR: Function failed: do_rootfs (see
> > | /usr/local/dev/yocto/isg-test/build/tmp/work/crownbay-poky-linux/core-
> > | image-sato-1.0-r0/temp/log.do_rootfs.1316 for further information)
> > ERROR: Task 7 (/usr/local/dev/yocto/isg-test/meta/recipes-
> > sato/images/core-image-sato.bb, do_rootfs) failed with exit code '1'
> > NOTE: Tasks Summary: Attempted 5528 tasks of which 400 didn't need to be
> > rerun and 1 failed.
> > No currently running tasks (5528 of 5530)
> > 
> > Summary: 1 task failed:
> >   /usr/local/dev/yocto/isg-test/meta/recipes-sato/images/core-image-
> > sato.bb, do_rootfs
> > 
> > Tom
> > 
> > 
> > > Signed-off-by: Nitin A Kamble <nitin.a.kamble at intel.com>
> > > ---
> > >  .../xorg-driver/emgd-driver-bin_1.14.bb            |   23
> > +++++++++++++++++++-
> > >  1 files changed, 22 insertions(+), 1 deletions(-)
> > >
> > > diff --git
> > > a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
> > > b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
> > > index cc78d61..ce37539 100644
> > > --- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
> > > +++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
> > > @@ -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-software-license-emgd-1.14 & Intel-user-space-graphics-
> > driver-binary-license-emgd-1.14"
> > >  LICENSE_FLAGS = "license_${PN}_${PV}"
> > > -PR = "r2"
> > > +PR = "r3"
> > >
> > >  EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
> > >  EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
> > > @@ -100,11 +100,32 @@ do_install () {
> > >      install -d -m 0755                                    ${D}${includedir}/VG
> > >      install -m 0755 ${S}/usr/include/VG/*.h               ${D}${includedir}/VG/
> > >
> > > +    ln -sf libEGL.so.1.5.15.3226                          ${D}${libdir}/libEGL.so.1
> > >      ln -sf libEGL.so.1                                    ${D}${libdir}/libEGL.so
> > > +    ln -sf libGLES_CM.so.1.5.15.3226
> > ${D}${libdir}/libGLES_CM.so.1
> > >      ln -sf libGLES_CM.so.1                                ${D}${libdir}/libGLES_CM.so
> > > +    ln -sf libGLESv2.so.1.5.15.3226                       ${D}${libdir}/libGLESv2.so.2
> > >      ln -sf libGLESv2.so.2                                 ${D}${libdir}/libGLESv2.so
> > > +    ln -sf libOpenVG.so.1.5.15.3226                       ${D}${libdir}/libOpenVG.so.1
> > >      ln -sf libOpenVG.so.1                                 ${D}${libdir}/libOpenVG.so
> > > +    ln -sf libOpenVGU.so.1.5.15.3226
> > ${D}${libdir}/libOpenVGU.so.1
> > >      ln -sf libOpenVGU.so.1                                ${D}${libdir}/libOpenVGU.so
> > > +
> > > +    #Replace duplicate files with symlinks
> > > +    rm -f ${D}${libdir}/libmixvideo.so.0
> > > +    ln -sf libmixvideo.so.0.10.9                          ${D}${libdir}/libmixvideo.so.0
> > > +    rm -f ${D}${libdir}/libmixvbp_h264.so.0
> > > +    ln -sf libmixvbp_h264.so.0.10.8
> > ${D}${libdir}/libmixvbp_h264.so.0
> > > +    rm -f ${D}${libdir}/libmixvbp.so.0
> > > +    ln -sf libmixvbp.so.0.10.8                            ${D}${libdir}/libmixvbp.so.0
> > > +    rm -f ${D}${libdir}/libmixvbp_vc1.so.0
> > > +    ln -sf libmixvbp_vc1.so.0.10.8
> > ${D}${libdir}/libmixvbp_vc1.so.0
> > > +    rm -f ${D}${libdir}/libmixvbp_mpeg4.so.0
> > > +    ln -sf libmixvbp_mpeg4.so.0.10.8
> > ${D}${libdir}/libmixvbp_mpeg4.so.0
> > > +    rm -f ${D}${libdir}/libmixcommon.so.0
> > > +    ln -sf libmixcommon.so.0.10.8
> > ${D}${libdir}/libmixcommon.so.0
> > > +    rm -f ${D}${libdir}/libgstvabuffer.so.0
> > > +    ln -sf libgstvabuffer.so.0.10.8                       ${D}${libdir}/libgstvabuffer.so.0
> > >  }
> > >
> > >  LEAD_SONAME = "libEGL.so"
> > 
> 