* [PATCH][meta-gplv2] gnutls: add older gnutls compatible with nettle
@ 2017-04-20 16:20 Martin Jansa
2017-04-20 17:59 ` Andre McCurdy
2017-04-24 14:29 ` [PATCHv2][meta-gplv2] " Martin Jansa
0 siblings, 2 replies; 9+ messages in thread
From: Martin Jansa @ 2017-04-20 16:20 UTC (permalink / raw)
To: yocto
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible
with nettle 2.7.1 used in meta-gplv2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++
recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++
2 files changed, 54 insertions(+)
create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
diff --git a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
new file mode 100644
index 0000000..44a9934
--- /dev/null
+++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
@@ -0,0 +1,31 @@
+From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Sat, 17 Jan 2015 17:02:15 +0000
+Subject: [PATCH] configure.ac: fix sed command
+
+The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
+when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6818a0..1c4582d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
+ dnl replace libopts-generated files with distributed backups, if present
+ missing_baks=
+ for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
+- nam=`echo $i|sed 's/.bak//g'`
++ nam=`echo $i|sed 's/\.bak$//'`
+ if test -f $i;then
+ cp -f $i $nam
+ else
+--
+2.0.1
+
diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb b/recipes-support/gnutls/gnutls_3.3.27.bb
new file mode 100644
index 0000000..2828581
--- /dev/null
+++ b/recipes-support/gnutls/gnutls_3.3.27.bb
@@ -0,0 +1,23 @@
+require recipes-support/gnutls/gnutls.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+ file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
+
+FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
+
+SRC_URI += " \
+ file://correct_rpl_gettimeofday_signature.patch \
+ file://configure.ac-fix-sed-command.patch \
+ file://use-pkg-config-to-locate-zlib.patch \
+"
+SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
+SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"
+
+# This version doesn't support this option added in newer gnutls
+# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option]
+PACKAGECONFIG[libidn] = ""
+# but it has the dependency
+DEPENDS += "libidn"
+
+# This version doesn't support this option added in newer gnutls
+EXTRA_OECONF_remove = "--without-libunistring-prefix"
--
2.12.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-gplv2] gnutls: add older gnutls compatible with nettle
2017-04-20 16:20 [PATCH][meta-gplv2] gnutls: add older gnutls compatible with nettle Martin Jansa
@ 2017-04-20 17:59 ` Andre McCurdy
2017-04-20 18:07 ` Martin Jansa
2017-04-24 14:29 ` [PATCHv2][meta-gplv2] " Martin Jansa
1 sibling, 1 reply; 9+ messages in thread
From: Andre McCurdy @ 2017-04-20 17:59 UTC (permalink / raw)
To: Martin Jansa; +Cc: yocto
On Thu, Apr 20, 2017 at 9:20 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * gnutls depends on nettle-3.1* since 3.4.0:
> The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
> https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
> and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
> https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
> * add recipe for last release in 3.3 branch which is compatible
> with nettle 2.7.1 used in meta-gplv2
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> .../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++
> recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++
> 2 files changed, 54 insertions(+)
> create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
>
> diff --git a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> new file mode 100644
> index 0000000..44a9934
> --- /dev/null
> +++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> @@ -0,0 +1,31 @@
> +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang@windriver.com>
> +Date: Sat, 17 Jan 2015 17:02:15 +0000
> +Subject: [PATCH] configure.ac: fix sed command
> +
> +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
> +when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index c6818a0..1c4582d 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
> + dnl replace libopts-generated files with distributed backups, if present
> + missing_baks=
> + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
> +- nam=`echo $i|sed 's/.bak//g'`
> ++ nam=`echo $i|sed 's/\.bak$//'`
> + if test -f $i;then
> + cp -f $i $nam
> + else
> +--
> +2.0.1
> +
> diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb b/recipes-support/gnutls/gnutls_3.3.27.bb
> new file mode 100644
> index 0000000..2828581
> --- /dev/null
> +++ b/recipes-support/gnutls/gnutls_3.3.27.bb
> @@ -0,0 +1,23 @@
> +require recipes-support/gnutls/gnutls.inc
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> + file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
> +
> +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
> +
> +SRC_URI += " \
> + file://correct_rpl_gettimeofday_signature.patch \
> + file://configure.ac-fix-sed-command.patch \
> + file://use-pkg-config-to-locate-zlib.patch \
> +"
> +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
> +SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"
> +
> +# This version doesn't support this option added in newer gnutls
> +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option]
> +PACKAGECONFIG[libidn] = ""
> +# but it has the dependency
> +DEPENDS += "libidn"
That dependency was removed for gnutls 3.3.x by:
http://git.openembedded.org/openembedded-core/commit/?id=6fd51f5c15a380eae630fe853ba0eccde7b9a369
> +# This version doesn't support this option added in newer gnutls
> +EXTRA_OECONF_remove = "--without-libunistring-prefix"
> --
> 2.12.2
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-gplv2] gnutls: add older gnutls compatible with nettle
2017-04-20 17:59 ` Andre McCurdy
@ 2017-04-20 18:07 ` Martin Jansa
2017-04-20 18:24 ` Andre McCurdy
0 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2017-04-20 18:07 UTC (permalink / raw)
To: Andre McCurdy; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 5279 bytes --]
I'll check the exact error message, but do_configure was failing for me
when I did first build without this dependency.
Most likely because this option was removed with 3.5.1 upgrade in:
commit e8ef5912aac0104d9a47d6d10a95e64426d8840e
Author: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Date: Tue Jun 28 11:06:16 2016 +0300
gnutls: update to 3.5.1
Remove no longer supported --disable-crywrap option.
Add a checksum for the LICENSE file with licensing overview.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
I've verified that even with this build dependency the main libgnutls
package doesn't runtime depend on libidn, which is enough for us, if you
have strong opinion about --disable-crywrap then we can return it in the
recipes-support/gnutls/gnutls_3.3.27.bb
On Thu, Apr 20, 2017 at 7:59 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Thu, Apr 20, 2017 at 9:20 AM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> > * gnutls depends on nettle-3.1* since 3.4.0:
> > The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
> > https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e5076327
> 71b0e76498
> > and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
> > https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba
> 463d6e731c
> > * add recipe for last release in 3.3 branch which is compatible
> > with nettle 2.7.1 used in meta-gplv2
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > .../gnutls/configure.ac-fix-sed-command.patch | 31
> ++++++++++++++++++++++
> > recipes-support/gnutls/gnutls_3.3.27.bb | 23
> ++++++++++++++++
> > 2 files changed, 54 insertions(+)
> > create mode 100644 recipes-support/gnutls/gnutls/
> configure.ac-fix-sed-command.patch
> > create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
> >
> > diff --git a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> > new file mode 100644
> > index 0000000..44a9934
> > --- /dev/null
> > +++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> > @@ -0,0 +1,31 @@
> > +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
> > +From: Robert Yang <liezhi.yang@windriver.com>
> > +Date: Sat, 17 Jan 2015 17:02:15 +0000
> > +Subject: [PATCH] configure.ac: fix sed command
> > +
> > +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
> > +when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
> > +
> > +Upstream-Status: Pending
> > +
> > +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> > +---
> > + configure.ac | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/configure.ac b/configure.ac
> > +index c6818a0..1c4582d 100644
> > +--- a/configure.ac
> > ++++ b/configure.ac
> > +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
> > + dnl replace libopts-generated files with distributed backups, if
> present
> > + missing_baks=
> > + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak;
> do
> > +- nam=`echo $i|sed 's/.bak//g'`
> > ++ nam=`echo $i|sed 's/\.bak$//'`
> > + if test -f $i;then
> > + cp -f $i $nam
> > + else
> > +--
> > +2.0.1
> > +
> > diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb
> b/recipes-support/gnutls/gnutls_3.3.27.bb
> > new file mode 100644
> > index 0000000..2828581
> > --- /dev/null
> > +++ b/recipes-support/gnutls/gnutls_3.3.27.bb
> > @@ -0,0 +1,23 @@
> > +require recipes-support/gnutls/gnutls.inc
> > +
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504
> \
> > + file://COPYING.LESSER;md5=
> a6f89e2100d9b6cdffcea4f398e37343"
> > +
> > +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-
> support/${BPN}/${BPN}:"
> > +
> > +SRC_URI += " \
> > + file://correct_rpl_gettimeofday_signature.patch \
> > + file://configure.ac-fix-sed-command.patch \
> > + file://use-pkg-config-to-locate-zlib.patch \
> > +"
> > +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
> > +SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d
> 02aa5d43b8cb711b1572650a7ffb56b17f"
> > +
> > +# This version doesn't support this option added in newer gnutls
> > +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was
> passed unrecognised options: --with-idn [unknown-configure-option]
> > +PACKAGECONFIG[libidn] = ""
> > +# but it has the dependency
> > +DEPENDS += "libidn"
>
> That dependency was removed for gnutls 3.3.x by:
>
> http://git.openembedded.org/openembedded-core/commit/?id=
> 6fd51f5c15a380eae630fe853ba0eccde7b9a369
>
> > +# This version doesn't support this option added in newer gnutls
> > +EXTRA_OECONF_remove = "--without-libunistring-prefix"
> > --
> > 2.12.2
> >
> > --
> > _______________________________________________
> > yocto mailing list
> > yocto@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/yocto
>
[-- Attachment #2: Type: text/html, Size: 8640 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-gplv2] gnutls: add older gnutls compatible with nettle
2017-04-20 18:07 ` Martin Jansa
@ 2017-04-20 18:24 ` Andre McCurdy
2017-04-21 14:40 ` Burton, Ross
0 siblings, 1 reply; 9+ messages in thread
From: Andre McCurdy @ 2017-04-20 18:24 UTC (permalink / raw)
To: Martin Jansa; +Cc: yocto
On Thu, Apr 20, 2017 at 11:07 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> I'll check the exact error message, but do_configure was failing for me when
> I did first build without this dependency.
>
> Most likely because this option was removed with 3.5.1 upgrade in:
> commit e8ef5912aac0104d9a47d6d10a95e64426d8840e
> Author: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> Date: Tue Jun 28 11:06:16 2016 +0300
>
> gnutls: update to 3.5.1
>
> Remove no longer supported --disable-crywrap option.
> Add a checksum for the LICENSE file with licensing overview.
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
>
OK, that makes sense. I have my own gnutls_3.3.27.bb recipe and wasn't
seeing the problem because I use a local gnutls.inc which still has
that option.
> I've verified that even with this build dependency the main libgnutls
> package doesn't runtime depend on libidn, which is enough for us, if you
> have strong opinion about --disable-crywrap then we can return it in the
> recipes-support/gnutls/gnutls_3.3.27.bb
Looking at configure.ac, I think restoring --disable-crywrap in
gnutls_3.3.27.bb is the cleanest solution.
> On Thu, Apr 20, 2017 at 7:59 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>>
>> On Thu, Apr 20, 2017 at 9:20 AM, Martin Jansa <martin.jansa@gmail.com>
>> wrote:
>> > * gnutls depends on nettle-3.1* since 3.4.0:
>> > The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
>> >
>> > https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
>> > and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
>> >
>> > https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
>> > * add recipe for last release in 3.3 branch which is compatible
>> > with nettle 2.7.1 used in meta-gplv2
>> >
>> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> > ---
>> > .../gnutls/configure.ac-fix-sed-command.patch | 31
>> > ++++++++++++++++++++++
>> > recipes-support/gnutls/gnutls_3.3.27.bb | 23
>> > ++++++++++++++++
>> > 2 files changed, 54 insertions(+)
>> > create mode 100644
>> > recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> > create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
>> >
>> > diff --git
>> > a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> > b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> > new file mode 100644
>> > index 0000000..44a9934
>> > --- /dev/null
>> > +++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> > @@ -0,0 +1,31 @@
>> > +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
>> > +From: Robert Yang <liezhi.yang@windriver.com>
>> > +Date: Sat, 17 Jan 2015 17:02:15 +0000
>> > +Subject: [PATCH] configure.ac: fix sed command
>> > +
>> > +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange
>> > errors
>> > +when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
>> > +
>> > +Upstream-Status: Pending
>> > +
>> > +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> > +---
>> > + configure.ac | 2 +-
>> > + 1 file changed, 1 insertion(+), 1 deletion(-)
>> > +
>> > +diff --git a/configure.ac b/configure.ac
>> > +index c6818a0..1c4582d 100644
>> > +--- a/configure.ac
>> > ++++ b/configure.ac
>> > +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
>> > + dnl replace libopts-generated files with distributed backups, if
>> > present
>> > + missing_baks=
>> > + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak;
>> > do
>> > +- nam=`echo $i|sed 's/.bak//g'`
>> > ++ nam=`echo $i|sed 's/\.bak$//'`
>> > + if test -f $i;then
>> > + cp -f $i $nam
>> > + else
>> > +--
>> > +2.0.1
>> > +
>> > diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb
>> > b/recipes-support/gnutls/gnutls_3.3.27.bb
>> > new file mode 100644
>> > index 0000000..2828581
>> > --- /dev/null
>> > +++ b/recipes-support/gnutls/gnutls_3.3.27.bb
>> > @@ -0,0 +1,23 @@
>> > +require recipes-support/gnutls/gnutls.inc
>> > +
>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504
>> > \
>> > +
>> > file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
>> > +
>> > +FILESEXTRAPATHS_prepend =
>> > "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
>> > +
>> > +SRC_URI += " \
>> > + file://correct_rpl_gettimeofday_signature.patch \
>> > + file://configure.ac-fix-sed-command.patch \
>> > + file://use-pkg-config-to-locate-zlib.patch \
>> > +"
>> > +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
>> > +SRC_URI[sha256sum] =
>> > "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"
>> > +
>> > +# This version doesn't support this option added in newer gnutls
>> > +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was
>> > passed unrecognised options: --with-idn [unknown-configure-option]
>> > +PACKAGECONFIG[libidn] = ""
>> > +# but it has the dependency
>> > +DEPENDS += "libidn"
>>
>> That dependency was removed for gnutls 3.3.x by:
>>
>>
>> http://git.openembedded.org/openembedded-core/commit/?id=6fd51f5c15a380eae630fe853ba0eccde7b9a369
>>
>> > +# This version doesn't support this option added in newer gnutls
>> > +EXTRA_OECONF_remove = "--without-libunistring-prefix"
>> > --
>> > 2.12.2
>> >
>> > --
>> > _______________________________________________
>> > yocto mailing list
>> > yocto@yoctoproject.org
>> > https://lists.yoctoproject.org/listinfo/yocto
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-gplv2] gnutls: add older gnutls compatible with nettle
2017-04-20 18:24 ` Andre McCurdy
@ 2017-04-21 14:40 ` Burton, Ross
0 siblings, 0 replies; 9+ messages in thread
From: Burton, Ross @ 2017-04-21 14:40 UTC (permalink / raw)
To: Andre McCurdy; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
On 20 April 2017 at 19:24, Andre McCurdy <armccurdy@gmail.com> wrote:
> OK, that makes sense. I have my own gnutls_3.3.27.bb recipe and wasn't
> seeing the problem because I use a local gnutls.inc which still has
> that option.
>
Another example of why .inc files have to be trivial or very carefully
maintained...
Yes, restoring the option seems like the best fix.
Ross
[-- Attachment #2: Type: text/html, Size: 933 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCHv2][meta-gplv2] gnutls: add older gnutls compatible with nettle
2017-04-20 16:20 [PATCH][meta-gplv2] gnutls: add older gnutls compatible with nettle Martin Jansa
2017-04-20 17:59 ` Andre McCurdy
@ 2017-04-24 14:29 ` Martin Jansa
2017-04-25 5:20 ` Mike Looijmans
2017-05-19 8:56 ` Martin Jansa
1 sibling, 2 replies; 9+ messages in thread
From: Martin Jansa @ 2017-04-24 14:29 UTC (permalink / raw)
To: yocto
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible
with nettle 2.7.1 used in meta-gplv2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++
recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++
2 files changed, 54 insertions(+)
create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
diff --git a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
new file mode 100644
index 0000000..44a9934
--- /dev/null
+++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
@@ -0,0 +1,31 @@
+From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Sat, 17 Jan 2015 17:02:15 +0000
+Subject: [PATCH] configure.ac: fix sed command
+
+The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
+when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6818a0..1c4582d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
+ dnl replace libopts-generated files with distributed backups, if present
+ missing_baks=
+ for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
+- nam=`echo $i|sed 's/.bak//g'`
++ nam=`echo $i|sed 's/\.bak$//'`
+ if test -f $i;then
+ cp -f $i $nam
+ else
+--
+2.0.1
+
diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb b/recipes-support/gnutls/gnutls_3.3.27.bb
new file mode 100644
index 0000000..c98da34
--- /dev/null
+++ b/recipes-support/gnutls/gnutls_3.3.27.bb
@@ -0,0 +1,23 @@
+require recipes-support/gnutls/gnutls.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+ file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
+
+FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
+
+SRC_URI += " \
+ file://correct_rpl_gettimeofday_signature.patch \
+ file://configure.ac-fix-sed-command.patch \
+ file://use-pkg-config-to-locate-zlib.patch \
+"
+SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
+SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"
+
+# This version doesn't support this option added in newer gnutls
+# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option]
+PACKAGECONFIG[libidn] = ""
+# but it still has the libidn dependency, without this option
+EXTRA_OECONF += "--disable-crywrap"
+
+# This version doesn't support this option added in newer gnutls
+EXTRA_OECONF_remove = "--without-libunistring-prefix"
--
2.12.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCHv2][meta-gplv2] gnutls: add older gnutls compatible with nettle
2017-04-24 14:29 ` [PATCHv2][meta-gplv2] " Martin Jansa
@ 2017-04-25 5:20 ` Mike Looijmans
2017-04-25 7:45 ` Andre McCurdy
2017-05-19 8:56 ` Martin Jansa
1 sibling, 1 reply; 9+ messages in thread
From: Mike Looijmans @ 2017-04-25 5:20 UTC (permalink / raw)
To: Martin Jansa, yocto
On 24-04-17 16:29, Martin Jansa wrote:
> * gnutls depends on nettle-3.1* since 3.4.0:
> The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
> https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
> and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
> https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
> * add recipe for last release in 3.3 branch which is compatible
> with nettle 2.7.1 used in meta-gplv2
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> .../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++
> recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++
> 2 files changed, 54 insertions(+)
> create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
>
> diff --git a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> new file mode 100644
> index 0000000..44a9934
> --- /dev/null
> +++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> @@ -0,0 +1,31 @@
> +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang@windriver.com>
> +Date: Sat, 17 Jan 2015 17:02:15 +0000
> +Subject: [PATCH] configure.ac: fix sed command
> +
> +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
> +when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index c6818a0..1c4582d 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
> + dnl replace libopts-generated files with distributed backups, if present
> + missing_baks=
> + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
> +- nam=`echo $i|sed 's/.bak//g'`
> ++ nam=`echo $i|sed 's/\.bak$//'`
How about:
nam=`basename $i .bak`
> + if test -f $i;then
> + cp -f $i $nam
> + else
> +--
> +2.0.1
> +
> diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb b/recipes-support/gnutls/gnutls_3.3.27.bb
> new file mode 100644
> index 0000000..c98da34
> --- /dev/null
> +++ b/recipes-support/gnutls/gnutls_3.3.27.bb
> @@ -0,0 +1,23 @@
> +require recipes-support/gnutls/gnutls.inc
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> + file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
> +
> +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
> +
> +SRC_URI += " \
> + file://correct_rpl_gettimeofday_signature.patch \
> + file://configure.ac-fix-sed-command.patch \
> + file://use-pkg-config-to-locate-zlib.patch \
> +"
> +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
> +SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"
> +
> +# This version doesn't support this option added in newer gnutls
> +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option]
> +PACKAGECONFIG[libidn] = ""
> +# but it still has the libidn dependency, without this option
> +EXTRA_OECONF += "--disable-crywrap"
> +
> +# This version doesn't support this option added in newer gnutls
> +EXTRA_OECONF_remove = "--without-libunistring-prefix"
>
Kind regards,
Mike Looijmans
System Expert
TOPIC Products
Materiaalweg 4, NL-5681 RJ Best
Postbus 440, NL-5680 AK Best
Telefoon: +31 (0) 499 33 69 79
E-mail: mike.looijmans@topicproducts.com
Website: www.topicproducts.com
Please consider the environment before printing this e-mail
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv2][meta-gplv2] gnutls: add older gnutls compatible with nettle
2017-04-25 5:20 ` Mike Looijmans
@ 2017-04-25 7:45 ` Andre McCurdy
0 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2017-04-25 7:45 UTC (permalink / raw)
To: Mike Looijmans; +Cc: yocto
On Mon, Apr 24, 2017 at 10:20 PM, Mike Looijmans
<mike.looijmans@topic.nl> wrote:
> On 24-04-17 16:29, Martin Jansa wrote:
>>
>> * gnutls depends on nettle-3.1* since 3.4.0:
>> The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
>>
>> https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
>> and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
>>
>> https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
>> * add recipe for last release in 3.3 branch which is compatible
>> with nettle 2.7.1 used in meta-gplv2
>>
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> ---
>> .../gnutls/configure.ac-fix-sed-command.patch | 31
>> ++++++++++++++++++++++
>> recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++
>> 2 files changed, 54 insertions(+)
>> create mode 100644
>> recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
>>
>> diff --git
>> a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> new file mode 100644
>> index 0000000..44a9934
>> --- /dev/null
>> +++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> @@ -0,0 +1,31 @@
>> +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
>> +From: Robert Yang <liezhi.yang@windriver.com>
>> +Date: Sat, 17 Jan 2015 17:02:15 +0000
>> +Subject: [PATCH] configure.ac: fix sed command
>> +
>> +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
>> +when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> +---
>> + configure.ac | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/configure.ac b/configure.ac
>> +index c6818a0..1c4582d 100644
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
>> + dnl replace libopts-generated files with distributed backups, if
>> present
>> + missing_baks=
>> + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
>> +- nam=`echo $i|sed 's/.bak//g'`
>> ++ nam=`echo $i|sed 's/\.bak$//'`
>
> How about:
> nam=`basename $i .bak`
This patch is a rebased version of the one in oe-core, so the oe-core
version should probably be the first candidate for any such
improvements.
>> + if test -f $i;then
>> + cp -f $i $nam
>> + else
>> +--
>> +2.0.1
>> +
>> diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb
>> b/recipes-support/gnutls/gnutls_3.3.27.bb
>> new file mode 100644
>> index 0000000..c98da34
>> --- /dev/null
>> +++ b/recipes-support/gnutls/gnutls_3.3.27.bb
>> @@ -0,0 +1,23 @@
>> +require recipes-support/gnutls/gnutls.inc
>> +
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
>> +
>> file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
>> +
>> +FILESEXTRAPATHS_prepend =
>> "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
>> +
>> +SRC_URI += " \
>> + file://correct_rpl_gettimeofday_signature.patch \
>> + file://configure.ac-fix-sed-command.patch \
>> + file://use-pkg-config-to-locate-zlib.patch \
>> +"
>> +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
>> +SRC_URI[sha256sum] =
>> "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"
>> +
>> +# This version doesn't support this option added in newer gnutls
>> +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was
>> passed unrecognised options: --with-idn [unknown-configure-option]
>> +PACKAGECONFIG[libidn] = ""
>> +# but it still has the libidn dependency, without this option
>> +EXTRA_OECONF += "--disable-crywrap"
>> +
>> +# This version doesn't support this option added in newer gnutls
>> +EXTRA_OECONF_remove = "--without-libunistring-prefix"
>>
>
>
>
> Kind regards,
>
> Mike Looijmans
> System Expert
>
> TOPIC Products
> Materiaalweg 4, NL-5681 RJ Best
> Postbus 440, NL-5680 AK Best
> Telefoon: +31 (0) 499 33 69 79
> E-mail: mike.looijmans@topicproducts.com
> Website: www.topicproducts.com
>
> Please consider the environment before printing this e-mail
>
>
>
>
>
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv2][meta-gplv2] gnutls: add older gnutls compatible with nettle
2017-04-24 14:29 ` [PATCHv2][meta-gplv2] " Martin Jansa
2017-04-25 5:20 ` Mike Looijmans
@ 2017-05-19 8:56 ` Martin Jansa
1 sibling, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2017-05-19 8:56 UTC (permalink / raw)
To: yocto
[-- Attachment #1: Type: text/plain, Size: 3987 bytes --]
ping
This is needed in both pyro and master branches. And possibly in morty
branch, but I haven't seen any replies about it in my RFC.
On Mon, Apr 24, 2017 at 4:29 PM, Martin Jansa <martin.jansa@gmail.com>
wrote:
> * gnutls depends on nettle-3.1* since 3.4.0:
> The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
> https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e5076327
> 71b0e76498
> and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
> https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba
> 463d6e731c
> * add recipe for last release in 3.3 branch which is compatible
> with nettle 2.7.1 used in meta-gplv2
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> .../gnutls/configure.ac-fix-sed-command.patch | 31
> ++++++++++++++++++++++
> recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++
> 2 files changed, 54 insertions(+)
> create mode 100644 recipes-support/gnutls/gnutls/
> configure.ac-fix-sed-command.patch
> create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
>
> diff --git a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> new file mode 100644
> index 0000000..44a9934
> --- /dev/null
> +++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
> @@ -0,0 +1,31 @@
> +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang@windriver.com>
> +Date: Sat, 17 Jan 2015 17:02:15 +0000
> +Subject: [PATCH] configure.ac: fix sed command
> +
> +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
> +when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index c6818a0..1c4582d 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
> + dnl replace libopts-generated files with distributed backups, if
> present
> + missing_baks=
> + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
> +- nam=`echo $i|sed 's/.bak//g'`
> ++ nam=`echo $i|sed 's/\.bak$//'`
> + if test -f $i;then
> + cp -f $i $nam
> + else
> +--
> +2.0.1
> +
> diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb
> b/recipes-support/gnutls/gnutls_3.3.27.bb
> new file mode 100644
> index 0000000..c98da34
> --- /dev/null
> +++ b/recipes-support/gnutls/gnutls_3.3.27.bb
> @@ -0,0 +1,23 @@
> +require recipes-support/gnutls/gnutls.inc
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> + file://COPYING.LESSER;md5=
> a6f89e2100d9b6cdffcea4f398e37343"
> +
> +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-
> support/${BPN}/${BPN}:"
> +
> +SRC_URI += " \
> + file://correct_rpl_gettimeofday_signature.patch \
> + file://configure.ac-fix-sed-command.patch \
> + file://use-pkg-config-to-locate-zlib.patch \
> +"
> +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
> +SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d
> 02aa5d43b8cb711b1572650a7ffb56b17f"
> +
> +# This version doesn't support this option added in newer gnutls
> +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was
> passed unrecognised options: --with-idn [unknown-configure-option]
> +PACKAGECONFIG[libidn] = ""
> +# but it still has the libidn dependency, without this option
> +EXTRA_OECONF += "--disable-crywrap"
> +
> +# This version doesn't support this option added in newer gnutls
> +EXTRA_OECONF_remove = "--without-libunistring-prefix"
> --
> 2.12.2
>
>
[-- Attachment #2: Type: text/html, Size: 6171 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-05-19 8:56 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-20 16:20 [PATCH][meta-gplv2] gnutls: add older gnutls compatible with nettle Martin Jansa
2017-04-20 17:59 ` Andre McCurdy
2017-04-20 18:07 ` Martin Jansa
2017-04-20 18:24 ` Andre McCurdy
2017-04-21 14:40 ` Burton, Ross
2017-04-24 14:29 ` [PATCHv2][meta-gplv2] " Martin Jansa
2017-04-25 5:20 ` Mike Looijmans
2017-04-25 7:45 ` Andre McCurdy
2017-05-19 8:56 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.