[meta-intel] [PATCH 1/1] emgd-driver-bin: add more necessary soft links

[Tom Zanussi]

On Mon, 2012-11-26 at 17:13 -0600, Kamble, Nitin A wrote:
> Tom, 
>   BTW Alexandre's commit is missing a PR bump. That is also one of the reason I combined the commit, to avoid Alexandre from resubmitting the commit.
> 

OK, yeah, if you can add the PR bump to yours, I can pull them both in
together but still keep them as separate commits, and it will accomplish
the same thing...

Tom

> Thanks,
> Nitin
> 
> > -----Original Message-----
> > From: Zanussi, Tom
> > Sent: Monday, November 26, 2012 3:01 PM
> > To: Kamble, Nitin A
> > Cc: meta-intel at yoctoproject.org; Hart, Darren; Alexandre Belloni
> > Subject: Re: [PATCH 1/1] emgd-driver-bin: add more necessary soft links
> > 
> > On Mon, 2012-11-26 at 14:35 -0800, nitin.a.kamble at intel.com wrote:
> > > From: Nitin A Kamble <nitin.a.kamble at intel.com>
> > >
> > > These links are needed to be able to at least compile xbmc.
> > >
> > > These changes avoid link issues like these:
> > > [...]/tmp/sysroots/x86_64-linux/usr/libexec/core2-poky-linux/gcc/i586-
> > > poky-linux/4.7.2/ld: warning: libEMGDegl.so, needed by
> > > [...]/tmp/sysroots/fri2/usr/lib/libGLESv2.so, not found (try using
> > > -rpath or -rpath-link)
> > > [...]/tmp/sysroots/x86_64-linux/usr/libexec/core2-poky-linux/gcc/i586-
> > > poky-linux/4.7.2/ld: warning: libemgdsrv_um.so, needed by
> > > [...]/tmp/sysroots/fri2/usr/lib/libGLESv2.so, not found (try using
> > > -rpath or -rpath-link)
> > >
> > > Signed-off-by: Alexandre Belloni <alexandre.belloni at piout.net>
> > > Signed-off-by: Nitin A Kamble <nitin.a.kamble at intel.com>
> > 
> > Hi Nitin,
> > 
> > Can you please resubmit only your changes, on top of Alexandre's - we
> > should keep the change history separate, and Alexandre's signed-off-by only
> > applies to his changes.
> > 
> > Thanks,
> > 
> > Tom
> > 
> > > ---
> > >  .../xorg-driver/emgd-driver-bin_1.14.bb            |   21 ++++++++++++++-----
> > >  1 files changed, 15 insertions(+), 6 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 ce37539..fccb65e 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 = "r3"
> > > +PR = "r4"
> > >
> > >  EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
> > >  EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
> > > @@ -100,16 +100,25 @@ 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
> > > +    EMGD_SNAPSHOT="1.5.15.3226"
> > > +    ln -sf libEGL.so.${EMGD_SNAPSHOT}                     ${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.${EMGD_SNAPSHOT}
> > ${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.${EMGD_SNAPSHOT}
> > ${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.${EMGD_SNAPSHOT}
> > ${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.${EMGD_SNAPSHOT}
> > ${D}${libdir}/libOpenVGU.so.1
> > >      ln -sf libOpenVGU.so.1                                ${D}${libdir}/libOpenVGU.so
> > > +    ln -sf libEMGD2d.so.${EMGD_SNAPSHOT}
> > ${D}${libdir}/libEMGD2d.so
> > > +    ln -sf libEMGDegl.so.${EMGD_SNAPSHOT}
> > ${D}${libdir}/libEMGDegl.so
> > > +    ln -sf libemgdglslcompiler.so.${EMGD_SNAPSHOT}
> > ${D}${libdir}/libemgdglslcompiler.so
> > > +    ln -sf libEMGDOGL.so.${EMGD_SNAPSHOT}
> > ${D}${libdir}/libEMGDOGL.so
> > > +    ln -sf libemgdPVR2D_DRIWSEGL.so.${EMGD_SNAPSHOT}
> > ${D}${libdir}/libemgdPVR2D_DRIWSEGL.so
> > > +    ln -sf libEMGDScopeServices.so.${EMGD_SNAPSHOT}
> > ${D}${libdir}/libEMGDScopeServices.so
> > > +    ln -sf libemgdsrv_init.so.${EMGD_SNAPSHOT}
> > ${D}${libdir}/libemgdsrv_init.so
> > > +    ln -sf libemgdsrv_um.so.${EMGD_SNAPSHOT}
> > ${D}${libdir}/libemgdsrv_um.so
> > >
> > >      #Replace duplicate files with symlinks
> > >      rm -f ${D}${libdir}/libmixvideo.so.0
> > 
>