[oe] [oe-commits] Koen Kooi : guile: fix licensing and gettext inherit

[Martin Jansa]

On Tue, Oct 11, 2011 at 02:43:35PM +0000, git version control wrote:
> Module: meta-openembedded.git
> Branch: master
> Commit: 8fcf92fed89557683a08f67667acc77a8f73dc0a
> URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=8fcf92fed89557683a08f67667acc77a8f73dc0a
> 
> Author: Koen Kooi <koen at dominion.thruhere.net>
> Date:   Tue Oct 11 16:40:25 2011 +0200
> 
> guile: fix licensing and gettext inherit
> 
> Reported by Philip Balister
> 
> Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
> 
> ---
> 
>  meta-oe/recipes-support/guile/guile-native.inc     |    1 -
>  .../recipes-support/guile/guile-native_1.8.7.bb    |    2 ++
>  meta-oe/recipes-support/guile/guile.inc            |    5 ++---
>  meta-oe/recipes-support/guile/guile_1.8.7.bb       |    2 ++
>  4 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/guile/guile-native.inc b/meta-oe/recipes-support/guile/guile-native.inc
> index 20ff541..dfa126a 100644
> --- a/meta-oe/recipes-support/guile/guile-native.inc
> +++ b/meta-oe/recipes-support/guile/guile-native.inc
> @@ -2,7 +2,6 @@ SECTION = "unknown"
>  DEPENDS = "gettext-native gmp-native"
>  
>  LICENSE = "LGPLv2.1"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"
>  
>  inherit autotools native
>  
> diff --git a/meta-oe/recipes-support/guile/guile-native_1.8.7.bb b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb
> index f8fd4c7..2b2707a 100644
> --- a/meta-oe/recipes-support/guile/guile-native_1.8.7.bb
> +++ b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb
> @@ -1,5 +1,7 @@
>  require guile-native.inc
>  
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"
> +
>  PR = "r1"
>  SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
>             file://configure-fix.patch \
> diff --git a/meta-oe/recipes-support/guile/guile.inc b/meta-oe/recipes-support/guile/guile.inc
> index 918ce33..842e8d7 100644
> --- a/meta-oe/recipes-support/guile/guile.inc
> +++ b/meta-oe/recipes-support/guile/guile.inc
> @@ -7,10 +7,9 @@ PACKAGES =+ "${PN}-el"
>  FILES_${PN}-el = "${datadir}/emacs"
>  DESCRIPTION_${PN}-el = "Emacs lisp files for Guile"
>  
> -LICENSE = "LGPLv2.1"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"
> +LICENSE = "LGPLv2.1+"
>  
> -inherit autotools
> +inherit autotools gettext
>  
>  acpaths = "-I ${S}/guile-config"
>  
> diff --git a/meta-oe/recipes-support/guile/guile_1.8.7.bb b/meta-oe/recipes-support/guile/guile_1.8.7.bb
> index 8b3a80d..d02fe42 100644
> --- a/meta-oe/recipes-support/guile/guile_1.8.7.bb
> +++ b/meta-oe/recipes-support/guile/guile_1.8.7.bb
> @@ -1,5 +1,7 @@
>  require guile.inc
>  
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=5711ae313ffd140741e741b88d9d4007"
> +
>  PR = "r1"
>  
>  SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \

Is there some special reason why
guile-1.8.7/18.diff is applied only in target recipe? I've noticed only
because different LIC_FILES_CHKSUM look strange..

Regards,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20111011/d1829bf4/attachment-0002.sig>