| Submitter | Saul Wold |
|---|---|
| Date | Jan. 5, 2012, 6:38 p.m. |
| Message ID | <024ef12e7ae22df2e8468ccdf1d78d6657905cd6.1325788605.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/18477/ |
| State | New |
| Headers | show |
Comments
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?
On 01/05/2012 11:33 AM, Denys Dmytriyenko wrote: > 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? > I will look into it again this week. Sau!
Patch
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"
GPLv2 version of gnutls does not need the gettext 0.18 patch since it still uses the over version of gettext that is also GPLv2. Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-support/gnutls/gnutls_2.12.14.bb | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)