[meta-intel] [PATCH v2 3/3] intel-gpu-tools: update 1.13 -> 1.14

[Saul Wold]

On Mon, 2016-03-21 at 17:40 -0700, Jianxun Zhang wrote:
> Content of COPYING is changed (refer to diff). Checksum of license
> is updated accordingly. Refer to yocto bugzilla bz9292 for test.
> 
Jianxun,

Including the diff here is not really helpful, the point of having the
checksum of the COPYING file is to watch for changes like dates, or
type of license, or additional terms.

In this case it seems that the License of the source has added a new
LICENSE type, ISC for the Internet Systems Consortium, you also have to
add ISC to the LICENSE metadata.

Since the LICENSE is initially set in the 'require' of xorg-app-
common.inc, we will need to set LICENSE via an append:

LICENSE_append = " & ICS"

I know this may not seem straight forward, but understanding the
licenses of the installed packages is very important.

Sau!


> diff --git a/COPYING b/COPYING
> index b8f6753..29e0238 100644
> --- a/COPYING
> +++ b/COPYING
> @@ -106,3 +106,23 @@ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
> ANY CLAIM, DAMAGES OR OTHER
>  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> ARISING
>  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
>  IN THE SOFTWARE.
> +
> +Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
> +    2013, 2014 by Internet Systems Consortium, Inc. ("ISC")
> +Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
> +    2002, 2003 by The Internet Software Consortium and Rich Salz
> +
> +This code is derived from software contributed to the Internet
> Software
> +Consortium by Rich Salz.
> +
> +Permission to use, copy, modify, and distribute this software for
> any
> +purpose with or without fee is hereby granted, provided that the
> above
> +copyright notice and this permission notice appear in all copies.
> +
> +THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
> WITH
> +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> +MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
> ANY
> +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
> AN
> +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
> OF
> +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> 
> bz9292
> 
> Signed-off-by: Jianxun Zhang <jianxun.zhang at linux.intel.com>
> ---
>  .../{intel-gpu-tools_1.13.bb => intel-gpu-
> tools_1.14.bb}            | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename common/recipes-graphics/intel-gpu-tools/{intel-gpu-
> tools_1.13.bb => intel-gpu-tools_1.14.bb} (83%)
> 
> diff --git a/common/recipes-graphics/intel-gpu-tools/intel-gpu-
> tools_1.13.bb b/common/recipes-graphics/intel-gpu-tools/intel-gpu-
> tools_1.14.bb
> similarity index 83%
> rename from common/recipes-graphics/intel-gpu-tools/intel-gpu-
> tools_1.13.bb
> rename to common/recipes-graphics/intel-gpu-tools/intel-gpu-
> tools_1.14.bb
> index 94772ca..7bad217 100644
> --- a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.13.bb
> +++ b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.14.bb
> @@ -3,7 +3,7 @@ require ${COREBASE}/meta/recipes-graphics/xorg-
> app/xorg-app-common.inc
>  SUMMARY = "Intel GPU tools"
>  DESCRIPTION = "Variety of small tools for testing intel graphics."
>  
> -LIC_FILES_CHKSUM =
> "file://COPYING;md5=0918806acfedc3e8c0488f2dd61616dd"
> +LIC_FILES_CHKSUM =
> "file://COPYING;md5=e4b3dd344780e0400593b21b115a6947"
>  
>  inherit autotools gtk-doc
>  
> @@ -13,8 +13,8 @@ RDEPENDS_${PN}-tests += "bash"
>  
>  PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests"
>  
> -SRC_URI[md5sum] = "9ef0d6385e2665db7afa6432f1418ed3"
> -SRC_URI[sha256sum] =
> "c6e65884c106eff4af3a6896ae3fede6bf309337962f2e75ab897f116872ae34"
> +SRC_URI[md5sum] = "b09d69526c86174007bea2228e36b2f1"
> +SRC_URI[sha256sum] =
> "3596e1d36e9c1203eed5abff5a0f272d573f4eb917b5cee4f029cce5a70a0f0c"
>  
>  PACKAGECONFIG ??= ""
>  PACKAGECONFIG[libunwind] = "--with-libunwind,--without-
> libunwind,libunwind,libunwind"
> -- 
> 1.9.1
>