[meta-intel] [PATCH 1/1] fri2: use emgd version 1.16 instead of 1.14

[Kamble, Nitin A]

> -----Original Message-----
> From: Hart, Darren
> Sent: Thursday, January 31, 2013 12:35 PM
> To: Kamble, Nitin A
> Cc: Zanussi, Tom; meta-intel at yoctoproject.org
> Subject: Re: [PATCH 1/1] fri2: use emgd version 1.16 instead of 1.14
> 
> On 01/31/2013 12:22 PM, nitin.a.kamble at intel.com wrote:
> > From: Nitin A Kamble <nitin.a.kamble at intel.com>
> >
> > The recently added version 1.16 of emgd graphics stack is also working
> > for the FRI2 bsp.
> >
> > Update the BSP to use the newer EMGD version for graphics.
> >
> > This partly addresses:
> > [YOCTO #3809]
> >
> > Signed-off-by: Nitin A Kamble <nitin.a.kamble at intel.com>
> > ---
> >  meta-fri2/README                                   |    8 ++++----
> >  meta-fri2/conf/machine/fri2.conf                   |    2 +-
> >  .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    2 +-
> >  3 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/meta-fri2/README b/meta-fri2/README index
> > 952130a..6a77841 100644
> > --- a/meta-fri2/README
> > +++ b/meta-fri2/README
> > @@ -109,10 +109,10 @@ following to the local.conf file:
> >
> >  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" to the LICENSE_FLAGS_WHITELIST variable in
> > -your local.conf.  For example:
> > +"license_emgd-driver-bin_1.16" to the LICENSE_FLAGS_WHITELIST
> > +variable in your local.conf.  For example:
> >
> > -  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin"
> > +  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.16"
> 
> 
> As I understand it, the non-versioned string is adequate and reduce the
> maintenance effort. Is there a particular reason you've added the version
> back?
> 

If end user building the FRI2 BSP sets 
    LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin"
as mentioned in the README, then he/she is going to meet a build failure.



> 
> >
> >  If you want to enable the layer that does not support EMGD graphics,
> > add the following to the local.conf file:
> > @@ -134,7 +134,7 @@ added to the the LICENSE_FLAGS_WHITELIST
> variable in your local.conf.
> >
> >  For example:
> >
> > -  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin commercial"
> > +  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.16
> commercial"
> 
> 
> Same...
> 
> 
> >
> >  The reason this is needed is to prevent the image from including
> > anything that might violate the license terms of the packages used to
> > diff --git a/meta-fri2/conf/machine/fri2.conf
> > b/meta-fri2/conf/machine/fri2.conf
> > index a1b13fa..12b8367 100644
> > --- a/meta-fri2/conf/machine/fri2.conf
> > +++ b/meta-fri2/conf/machine/fri2.conf
> > @@ -27,7 +27,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
> > PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
> >  PREFERRED_VERSION_mesa-dri ?= "9.0.1"
> >  PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
> > -PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
> > +PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
> >
> >  # Syslinux does not know about the 64MHz uart clock and it does not
> > detect the  # serial device by number. Use the IO port directly and
> > divide the baud down to diff --git
> > a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
> > b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
> > index 9165f21..e47bae3 100644
> > --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
> > +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
> > @@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >  COMPATIBLE_MACHINE_fri2 = "fri2"
> >  KMACHINE_fri2  = "fri2"
> >  KBRANCH_fri2 = "standard/fri2"
> > -KERNEL_FEATURES_fri2_append = " features/drm-emgd cfg/vesafb"
> > +KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.16
> cfg/vesafb"
> >  SRCREV_machine_pn-linux-yocto_fri2 ?= "${AUTOREV}"
> >  SRCREV_meta_pn-linux-yocto_fri2 ?= "${AUTOREV}"
> >
> >
> 
> --
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Linux Kernel