[OE-core] [PATCH 2/2] gnutls: remove gettext patch for non-GPLv3

Denys Dmytriyenko denis at denix.org
Thu Jan 5 19:33:57 UTC 2012


On Thu, Jan 05, 2012 at 10:38:37AM -0800, Saul Wold wrote:
> GPLv2 version of gnutls does not need the gettext 0.18 patch
> since it still uses the over version of gettext that is also

"uses the older version", I guess, not "over"...

Thanks for the patch! Have you looked at gnutls-extras by any chance? Do you 
have any details about its GPLv2/v3 licensing?

-- 
Denys


> GPLv2.
> 
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> ---
>  meta/recipes-support/gnutls/gnutls_2.12.14.bb |   13 ++++++++++---
>  1 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
> index 045ba69..21fd187 100644
> --- a/meta/recipes-support/gnutls/gnutls_2.12.14.bb
> +++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
> @@ -1,10 +1,17 @@
>  require gnutls.inc
>  
> -PR = "${INC_PR}.3"
> +PR = "${INC_PR}.4"
>  
>  SRC_URI += "file://gnutls-openssl.patch \
> -            file://configure-fix.patch \
> -            file://fix-gettext-version.patch"
> +            file://configure-fix.patch"
> +
> +python() {
> +    if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
> +        # if GPLv3 add patch
> +        src_uri = (d.getVar("SRC_URI", False) or "").split()
> +        src_uri.append("file://fix-gettext-version.patch")
> +        d.setVar("SRC_URI", " ".join(src_uri))
> +}
>  
>  SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c"
>  SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"
> -- 
> 1.7.6.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core




More information about the Openembedded-core mailing list