* [PATCH 1/6] nettle: Fix binary license to LGPLv2.1+
2015-08-27 13:05 [PATCH 0/6] Bring back LGPLv2 gmp, upgrade gnutls stack Jussi Kukkonen
@ 2015-08-27 13:05 ` Jussi Kukkonen
2015-08-27 13:05 ` [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+) Jussi Kukkonen
` (4 subsequent siblings)
5 siblings, 0 replies; 26+ messages in thread
From: Jussi Kukkonen @ 2015-08-27 13:05 UTC (permalink / raw)
To: openembedded-core
* Set the nettle binary package license to LGPLv2.1+:
There are GPL files in the sources but none of these are used
to produce the files we ship.
* Remove the useless package specific licenses: none of the named
packages are actually produced and the licenses do not affect
the overall license of either the sources or the binary package.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-support/nettle/nettle_2.7.1.bb | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/meta/recipes-support/nettle/nettle_2.7.1.bb
index f9d331f..7823df9 100644
--- a/meta/recipes-support/nettle/nettle_2.7.1.bb
+++ b/meta/recipes-support/nettle/nettle_2.7.1.bb
@@ -2,14 +2,7 @@ SUMMARY = "A low level cryptographic library"
HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
SECTION = "libs"
LICENSE = "LGPLv2.1 & GPLv2"
-
-LICENSE_${PN}-cast = "CC0"
-LICENSE_${PN}-gosthash = "MIT"
-
-# both public and GPL license listed
-LICENSE_${PN}-md2 = "CC0 & LGPLv2.1+"
-LICENSE_${PN}-md4 = "CC0 & LGPLv2.1+"
-
+LICENSE_${PN} = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \
--
2.1.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-27 13:05 [PATCH 0/6] Bring back LGPLv2 gmp, upgrade gnutls stack Jussi Kukkonen
2015-08-27 13:05 ` [PATCH 1/6] nettle: Fix binary license to LGPLv2.1+ Jussi Kukkonen
@ 2015-08-27 13:05 ` Jussi Kukkonen
2015-08-28 6:03 ` Khem Raj
2015-08-27 13:06 ` [PATCH 3/6] nettle: Add (LGPLv3) version 3.1.1 Jussi Kukkonen
` (3 subsequent siblings)
5 siblings, 1 reply; 26+ messages in thread
From: Jussi Kukkonen @ 2015-08-27 13:05 UTC (permalink / raw)
To: openembedded-core
gmp 4.2.1 was removed in f181c6ce8b apparently accidentally: It
was not noticed that 4.2.1 is LGPL 2.1 (and not GPL) so provides
a useful alternative to the newer "GPLv2 | LGPLv3" version.
* Reintroduce 4.2.1. The source includes files that are GPL but the
library package is LGPL 2.1+
* Also reintroduce the two patches removed in f181c6ce8b.
* Refactor gmp.inc: gmp 6.0.0 build should not be affected in any way.
* Update 6.0.0 license from "GPLv2 | LGPLv3" to "GPLv2+ | LGPLv3+".
[YOCTO #8197]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../gmp/gmp-4.2.1/disable-stdc.patch | 39 +++++++++++++++
.../gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch | 56 ++++++++++++++++++++++
.../gmp/{gmp => gmp-6.0.0}/amd64.patch | 0
.../append_user_provided_flags.patch | 0
.../gmp/{gmp => gmp-6.0.0}/configure.patch | 0
.../gmp/{gmp => gmp-6.0.0}/gmp-6.0.0-ppc64.patch | 0
.../gmp/{gmp => gmp-6.0.0}/use-includedir.patch | 0
meta/recipes-support/gmp/gmp.inc | 19 +-------
meta/recipes-support/gmp/gmp_4.2.1.bb | 15 ++++++
meta/recipes-support/gmp/gmp_6.0.0.bb | 33 ++++++++++---
10 files changed, 137 insertions(+), 25 deletions(-)
create mode 100644 meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
create mode 100644 meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/amd64.patch (100%)
rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/append_user_provided_flags.patch (100%)
rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/configure.patch (100%)
rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/gmp-6.0.0-ppc64.patch (100%)
rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/use-includedir.patch (100%)
create mode 100644 meta/recipes-support/gmp/gmp_4.2.1.bb
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
new file mode 100644
index 0000000..5decb1c
--- /dev/null
+++ b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
@@ -0,0 +1,39 @@
+This patch was removed in f181c6ce8b3 when gmp 4.2.1 was mistakenly
+dropped.
+
+Upstream is not interested in patches for ancient versions.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+
+# "extern inline" in traditional gcc means that the function should be
+# inlined wherever it's seen, while in C99, "extern inline" means that i
+# the function should only be inlined where the inline definition is
+# seen while in other places it's not inlined:
+# http://gcc.gnu.org/ml/gcc/2006-11/msg00006.html
+#
+# gmp checks "--std=gnu99" to use C99 convention however it internally
+# defines some "extern inline" functions in gmp.h, which is included
+# by mainly .c files and finally lead a flood of redefinition function
+# errors when linking objects together.
+#
+# So disable C99/ANSI detection to stick to tranditional gcc behavior
+#
+# by Kevin Tian <kevin.tian@intel.com>, 2010-08-13
+#
+# (this patch is licensed under GPLv2+)
+
+diff --git a/configure.in b/configure.in
+index 450cc92..aab0b59 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1869,9 +1869,7 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
+
+ # The C compiler and preprocessor, put into ANSI mode if possible.
+ AC_PROG_CC
+-AC_PROG_CC_STDC
+ AC_PROG_CPP
+-GMP_H_ANSI
+
+
+ # The C compiler on the build system, and associated tests.
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch b/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
new file mode 100644
index 0000000..63aed05
--- /dev/null
+++ b/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
@@ -0,0 +1,56 @@
+automake 1.12 has depricated automatic de-ANSI-fication support
+
+this patch avoids these kinds of errors:
+
+| configure.in:2240: error: automatic de-ANSI-fication support has been removed
+| Makefile.am:28: error: automatic de-ANSI-fication support has been removed
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/02
+
+
+This patch was removed in f181c6ce8b3 when gmp 4.2.1 was mistakenly
+dropped.
+
+Upstream is not interested in patches for ancient versions.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+
+
+Index: gmp-4.2.1/configure.in
+===================================================================
+--- gmp-4.2.1.orig/configure.in
++++ gmp-4.2.1/configure.in
+@@ -67,7 +67,7 @@ dnl
+ dnl Note that there's a copy of these options in the top-level Makefile.am,
+ dnl so update there too if changing anything.
+ dnl
+-AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
++AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
+ AM_CONFIG_HEADER(config.h:config.in)
+ AM_MAINTAINER_MODE
+
+@@ -2022,9 +2022,6 @@ fi
+ echo " MPN_PATH=\"$path\""
+
+
+-# Automake ansi2knr support.
+-AM_C_PROTOTYPES
+-
+ GMP_PROG_AR
+ GMP_PROG_NM
+
+Index: gmp-4.2.1/Makefile.am
+===================================================================
+--- gmp-4.2.1.orig/Makefile.am
++++ gmp-4.2.1/Makefile.am
+@@ -27,7 +27,7 @@
+ # Makefiles in subdirectories, but here we must omit it so automake gives
+ # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".
+ #
+-AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
++AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
+
+
+ # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the
diff --git a/meta/recipes-support/gmp/gmp/amd64.patch b/meta/recipes-support/gmp/gmp-6.0.0/amd64.patch
similarity index 100%
rename from meta/recipes-support/gmp/gmp/amd64.patch
rename to meta/recipes-support/gmp/gmp-6.0.0/amd64.patch
diff --git a/meta/recipes-support/gmp/gmp/append_user_provided_flags.patch b/meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch
similarity index 100%
rename from meta/recipes-support/gmp/gmp/append_user_provided_flags.patch
rename to meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch
diff --git a/meta/recipes-support/gmp/gmp/configure.patch b/meta/recipes-support/gmp/gmp-6.0.0/configure.patch
similarity index 100%
rename from meta/recipes-support/gmp/gmp/configure.patch
rename to meta/recipes-support/gmp/gmp-6.0.0/configure.patch
diff --git a/meta/recipes-support/gmp/gmp/gmp-6.0.0-ppc64.patch b/meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch
similarity index 100%
rename from meta/recipes-support/gmp/gmp/gmp-6.0.0-ppc64.patch
rename to meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch
diff --git a/meta/recipes-support/gmp/gmp/use-includedir.patch b/meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch
similarity index 100%
rename from meta/recipes-support/gmp/gmp/use-includedir.patch
rename to meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch
diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc
index 65cde21..6752a39 100644
--- a/meta/recipes-support/gmp/gmp.inc
+++ b/meta/recipes-support/gmp/gmp.inc
@@ -2,32 +2,15 @@ SECTION = "devel"
SUMMARY = "GNU multiprecision arithmetic library"
DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers"
HOMEPAGE = "http://gmplib.org/"
-LICENSE = "GPLv3 LGPLv3"
REVISION ?= ""
-
-SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \
- file://configure.patch \
- file://amd64.patch "
+SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2"
inherit autotools texinfo
ARM_INSTRUCTION_SET = "arm"
-acpaths = ""
-
BBCLASSEXTEND = "native nativesdk"
PACKAGECONFIG ??= ""
PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline"
-
-EXTRA_OECONF += " --enable-cxx=detect"
-
-PACKAGES =+ "libgmpxx"
-FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}"
-
-do_install_append_class-target() {
- sed -i "s|--sysroot=${STAGING_DIR_HOST}||g" ${D}${includedir}/gmp.h
-}
-
-SSTATE_SCAN_FILES += "gmp.h"
diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb b/meta/recipes-support/gmp/gmp_4.2.1.bb
new file mode 100644
index 0000000..928c01a
--- /dev/null
+++ b/meta/recipes-support/gmp/gmp_4.2.1.bb
@@ -0,0 +1,15 @@
+require gmp.inc
+
+LICENSE = "LGPLv2.1+ & GPLv2+"
+LICENSE_${PN} = "LGPLv2.1+"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \
+ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
+ file://gmp-h.in;beginline=6;endline=21;md5=e056f74a12c3277d730dbcfb85d2ca34"
+
+SRC_URI += "file://disable-stdc.patch \
+ file://gmp_fix_for_automake-1.12.patch \
+ "
+
+SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3"
+SRC_URI[sha256sum] = "d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941"
diff --git a/meta/recipes-support/gmp/gmp_6.0.0.bb b/meta/recipes-support/gmp/gmp_6.0.0.bb
index 6218491..19b63e5 100644
--- a/meta/recipes-support/gmp/gmp_6.0.0.bb
+++ b/meta/recipes-support/gmp/gmp_6.0.0.bb
@@ -1,14 +1,33 @@
require gmp.inc
-LICENSE="GPLv2 | LGPLv3"
+
+LICENSE="GPLv2+ | LGPLv3+"
+
REVISION="a"
+
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
- file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
- file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-"
-SRC_URI_append = " file://use-includedir.patch \
- file://append_user_provided_flags.patch \
- file://gmp-6.0.0-ppc64.patch \
+ file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
+ file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
"
+SRC_URI += "file://configure.patch \
+ file://amd64.patch \
+ file://use-includedir.patch \
+ file://append_user_provided_flags.patch \
+ file://gmp-6.0.0-ppc64.patch \
+ "
SRC_URI[md5sum] = "b7ff2d88cae7f8085bd5006096eed470"
SRC_URI[sha256sum] = "7f8e9a804b9c6d07164cf754207be838ece1219425d64e28cfa3e70d5c759aaf"
+
+acpaths = ""
+
+EXTRA_OECONF += " --enable-cxx=detect"
+
+PACKAGES =+ "libgmpxx"
+FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}"
+
+do_install_append_class-target() {
+ sed -i "s|--sysroot=${STAGING_DIR_HOST}||g" ${D}${includedir}/gmp.h
+}
+
+SSTATE_SCAN_FILES += "gmp.h"
+
--
2.1.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-27 13:05 ` [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+) Jussi Kukkonen
@ 2015-08-28 6:03 ` Khem Raj
2015-08-28 7:44 ` Jussi Kukkonen
0 siblings, 1 reply; 26+ messages in thread
From: Khem Raj @ 2015-08-28 6:03 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 11537 bytes --]
> On Aug 27, 2015, at 6:05 AM, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
>
> gmp 4.2.1 was removed in f181c6ce8b apparently accidentally: It
> was not noticed that 4.2.1 is LGPL 2.1 (and not GPL) so provides
> a useful alternative to the newer "GPLv2 | LGPLv3" version.
>
> * Reintroduce 4.2.1. The source includes files that are GPL but the
> library package is LGPL 2.1+
> * Also reintroduce the two patches removed in f181c6ce8b.
> * Refactor gmp.inc: gmp 6.0.0 build should not be affected in any way.
> * Update 6.0.0 license from "GPLv2 | LGPLv3" to "GPLv2+ | LGPLv3+".
>
> [YOCTO #8197]
there are issues with gmp on arm especially thumb mode. What kind of testing have you done on this ?
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
> .../gmp/gmp-4.2.1/disable-stdc.patch | 39 +++++++++++++++
> .../gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch | 56 ++++++++++++++++++++++
> .../gmp/{gmp => gmp-6.0.0}/amd64.patch | 0
> .../append_user_provided_flags.patch | 0
> .../gmp/{gmp => gmp-6.0.0}/configure.patch | 0
> .../gmp/{gmp => gmp-6.0.0}/gmp-6.0.0-ppc64.patch | 0
> .../gmp/{gmp => gmp-6.0.0}/use-includedir.patch | 0
> meta/recipes-support/gmp/gmp.inc | 19 +-------
> meta/recipes-support/gmp/gmp_4.2.1.bb | 15 ++++++
> meta/recipes-support/gmp/gmp_6.0.0.bb | 33 ++++++++++---
> 10 files changed, 137 insertions(+), 25 deletions(-)
> create mode 100644 meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
> create mode 100644 meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
> rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/amd64.patch (100%)
> rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/append_user_provided_flags.patch (100%)
> rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/configure.patch (100%)
> rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/gmp-6.0.0-ppc64.patch (100%)
> rename meta/recipes-support/gmp/{gmp => gmp-6.0.0}/use-includedir.patch (100%)
> create mode 100644 meta/recipes-support/gmp/gmp_4.2.1.bb
>
> diff --git a/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
> new file mode 100644
> index 0000000..5decb1c
> --- /dev/null
> +++ b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
> @@ -0,0 +1,39 @@
> +This patch was removed in f181c6ce8b3 when gmp 4.2.1 was mistakenly
> +dropped.
> +
> +Upstream is not interested in patches for ancient versions.
> +
> +Upstream-Status: Inappropriate
> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +
> +# "extern inline" in traditional gcc means that the function should be
> +# inlined wherever it's seen, while in C99, "extern inline" means that i
> +# the function should only be inlined where the inline definition is
> +# seen while in other places it's not inlined:
> +# http://gcc.gnu.org/ml/gcc/2006-11/msg00006.html
> +#
> +# gmp checks "--std=gnu99" to use C99 convention however it internally
> +# defines some "extern inline" functions in gmp.h, which is included
> +# by mainly .c files and finally lead a flood of redefinition function
> +# errors when linking objects together.
> +#
> +# So disable C99/ANSI detection to stick to tranditional gcc behavior
> +#
> +# by Kevin Tian <kevin.tian@intel.com>, 2010-08-13
> +#
> +# (this patch is licensed under GPLv2+)
> +
> +diff --git a/configure.in b/configure.in
> +index 450cc92..aab0b59 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -1869,9 +1869,7 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
> +
> + # The C compiler and preprocessor, put into ANSI mode if possible.
> + AC_PROG_CC
> +-AC_PROG_CC_STDC
> + AC_PROG_CPP
> +-GMP_H_ANSI
> +
> +
> + # The C compiler on the build system, and associated tests.
> diff --git a/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch b/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
> new file mode 100644
> index 0000000..63aed05
> --- /dev/null
> +++ b/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
> @@ -0,0 +1,56 @@
> +automake 1.12 has depricated automatic de-ANSI-fication support
> +
> +this patch avoids these kinds of errors:
> +
> +| configure.in:2240: error: automatic de-ANSI-fication support has been removed
> +| Makefile.am:28: error: automatic de-ANSI-fication support has been removed
> +
> +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> +2012/05/02
> +
> +
> +This patch was removed in f181c6ce8b3 when gmp 4.2.1 was mistakenly
> +dropped.
> +
> +Upstream is not interested in patches for ancient versions.
> +
> +Upstream-Status: Inappropriate
> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +
> +
> +Index: gmp-4.2.1/configure.in
> +===================================================================
> +--- gmp-4.2.1.orig/configure.in
> ++++ gmp-4.2.1/configure.in
> +@@ -67,7 +67,7 @@ dnl
> + dnl Note that there's a copy of these options in the top-level Makefile.am,
> + dnl so update there too if changing anything.
> + dnl
> +-AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
> ++AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
> + AM_CONFIG_HEADER(config.h:config.in)
> + AM_MAINTAINER_MODE
> +
> +@@ -2022,9 +2022,6 @@ fi
> + echo " MPN_PATH=\"$path\""
> +
> +
> +-# Automake ansi2knr support.
> +-AM_C_PROTOTYPES
> +-
> + GMP_PROG_AR
> + GMP_PROG_NM
> +
> +Index: gmp-4.2.1/Makefile.am
> +===================================================================
> +--- gmp-4.2.1.orig/Makefile.am
> ++++ gmp-4.2.1/Makefile.am
> +@@ -27,7 +27,7 @@
> + # Makefiles in subdirectories, but here we must omit it so automake gives
> + # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".
> + #
> +-AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
> ++AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
> +
> +
> + # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the
> diff --git a/meta/recipes-support/gmp/gmp/amd64.patch b/meta/recipes-support/gmp/gmp-6.0.0/amd64.patch
> similarity index 100%
> rename from meta/recipes-support/gmp/gmp/amd64.patch
> rename to meta/recipes-support/gmp/gmp-6.0.0/amd64.patch
> diff --git a/meta/recipes-support/gmp/gmp/append_user_provided_flags.patch b/meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch
> similarity index 100%
> rename from meta/recipes-support/gmp/gmp/append_user_provided_flags.patch
> rename to meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch
> diff --git a/meta/recipes-support/gmp/gmp/configure.patch b/meta/recipes-support/gmp/gmp-6.0.0/configure.patch
> similarity index 100%
> rename from meta/recipes-support/gmp/gmp/configure.patch
> rename to meta/recipes-support/gmp/gmp-6.0.0/configure.patch
> diff --git a/meta/recipes-support/gmp/gmp/gmp-6.0.0-ppc64.patch b/meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch
> similarity index 100%
> rename from meta/recipes-support/gmp/gmp/gmp-6.0.0-ppc64.patch
> rename to meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch
> diff --git a/meta/recipes-support/gmp/gmp/use-includedir.patch b/meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch
> similarity index 100%
> rename from meta/recipes-support/gmp/gmp/use-includedir.patch
> rename to meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch
> diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc
> index 65cde21..6752a39 100644
> --- a/meta/recipes-support/gmp/gmp.inc
> +++ b/meta/recipes-support/gmp/gmp.inc
> @@ -2,32 +2,15 @@ SECTION = "devel"
> SUMMARY = "GNU multiprecision arithmetic library"
> DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers"
> HOMEPAGE = "http://gmplib.org/"
> -LICENSE = "GPLv3 LGPLv3"
>
> REVISION ?= ""
> -
> -SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \
> - file://configure.patch \
> - file://amd64.patch "
> +SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2"
>
> inherit autotools texinfo
>
> ARM_INSTRUCTION_SET = "arm"
>
> -acpaths = ""
> -
> BBCLASSEXTEND = "native nativesdk"
>
> PACKAGECONFIG ??= ""
> PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline"
> -
> -EXTRA_OECONF += " --enable-cxx=detect"
> -
> -PACKAGES =+ "libgmpxx"
> -FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}"
> -
> -do_install_append_class-target() {
> - sed -i "s|--sysroot=${STAGING_DIR_HOST}||g" ${D}${includedir}/gmp.h
> -}
> -
> -SSTATE_SCAN_FILES += "gmp.h"
> diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb b/meta/recipes-support/gmp/gmp_4.2.1.bb
> new file mode 100644
> index 0000000..928c01a
> --- /dev/null
> +++ b/meta/recipes-support/gmp/gmp_4.2.1.bb
> @@ -0,0 +1,15 @@
> +require gmp.inc
> +
> +LICENSE = "LGPLv2.1+ & GPLv2+"
> +LICENSE_${PN} = "LGPLv2.1+"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \
> + file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
> + file://gmp-h.in;beginline=6;endline=21;md5=e056f74a12c3277d730dbcfb85d2ca34"
> +
> +SRC_URI += "file://disable-stdc.patch \
> + file://gmp_fix_for_automake-1.12.patch \
> + "
> +
> +SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3"
> +SRC_URI[sha256sum] = "d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941"
> diff --git a/meta/recipes-support/gmp/gmp_6.0.0.bb b/meta/recipes-support/gmp/gmp_6.0.0.bb
> index 6218491..19b63e5 100644
> --- a/meta/recipes-support/gmp/gmp_6.0.0.bb
> +++ b/meta/recipes-support/gmp/gmp_6.0.0.bb
> @@ -1,14 +1,33 @@
> require gmp.inc
> -LICENSE="GPLv2 | LGPLv3"
> +
> +LICENSE="GPLv2+ | LGPLv3+"
> +
> REVISION="a"
> +
> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> - file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
> - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> -"
> -SRC_URI_append = " file://use-includedir.patch \
> - file://append_user_provided_flags.patch \
> - file://gmp-6.0.0-ppc64.patch \
> + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
> + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> "
>
> +SRC_URI += "file://configure.patch \
> + file://amd64.patch \
> + file://use-includedir.patch \
> + file://append_user_provided_flags.patch \
> + file://gmp-6.0.0-ppc64.patch \
> + "
> SRC_URI[md5sum] = "b7ff2d88cae7f8085bd5006096eed470"
> SRC_URI[sha256sum] = "7f8e9a804b9c6d07164cf754207be838ece1219425d64e28cfa3e70d5c759aaf"
> +
> +acpaths = ""
> +
> +EXTRA_OECONF += " --enable-cxx=detect"
> +
> +PACKAGES =+ "libgmpxx"
> +FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}"
> +
> +do_install_append_class-target() {
> + sed -i "s|--sysroot=${STAGING_DIR_HOST}||g" ${D}${includedir}/gmp.h
> +}
> +
> +SSTATE_SCAN_FILES += "gmp.h"
> +
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-28 6:03 ` Khem Raj
@ 2015-08-28 7:44 ` Jussi Kukkonen
2015-08-29 6:17 ` Jussi Kukkonen
0 siblings, 1 reply; 26+ messages in thread
From: Jussi Kukkonen @ 2015-08-28 7:44 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 954 bytes --]
On 28 August 2015 at 09:03, Khem Raj <raj.khem@gmail.com> wrote:
>
>
> > On Aug 27, 2015, at 6:05 AM, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:
> >
> > gmp 4.2.1 was removed in f181c6ce8b apparently accidentally: It
> > was not noticed that 4.2.1 is LGPL 2.1 (and not GPL) so provides
> > a useful alternative to the newer "GPLv2 | LGPLv3" version.
> >
> > * Reintroduce 4.2.1. The source includes files that are GPL but the
> > library package is LGPL 2.1+
> > * Also reintroduce the two patches removed in f181c6ce8b.
> > * Refactor gmp.inc: gmp 6.0.0 build should not be affected in any way.
> > * Update 6.0.0 license from "GPLv2 | LGPLv3" to "GPLv2+ | LGPLv3+".
> >
> > [YOCTO #8197]
>
> there are issues with gmp on arm especially thumb mode. What kind of
testing have you done on this ?
I have not tested on arm and at don't really have means to do so.
Suggestions to limit the possible harm are welcome.
Jussi
[-- Attachment #2: Type: text/html, Size: 1238 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-28 7:44 ` Jussi Kukkonen
@ 2015-08-29 6:17 ` Jussi Kukkonen
2015-08-29 8:43 ` Martin Jansa
0 siblings, 1 reply; 26+ messages in thread
From: Jussi Kukkonen @ 2015-08-29 6:17 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1390 bytes --]
On 28 August 2015 at 10:44, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
> On 28 August 2015 at 09:03, Khem Raj <raj.khem@gmail.com> wrote:
> > > On Aug 27, 2015, at 6:05 AM, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:
> > >
> > > gmp 4.2.1 was removed in f181c6ce8b apparently accidentally: It
> > > was not noticed that 4.2.1 is LGPL 2.1 (and not GPL) so provides
> > > a useful alternative to the newer "GPLv2 | LGPLv3" version.
> > >
> > > * Reintroduce 4.2.1. The source includes files that are GPL but the
> > > library package is LGPL 2.1+
> > > * Also reintroduce the two patches removed in f181c6ce8b.
> > > * Refactor gmp.inc: gmp 6.0.0 build should not be affected in any way.
> > > * Update 6.0.0 license from "GPLv2 | LGPLv3" to "GPLv2+ | LGPLv3+".
> > >
> > > [YOCTO #8197]
> >
> > there are issues with gmp on arm especially thumb mode. What kind of
testing have you done on this ?
>
> I have not tested on arm and at don't really have means to do so.
Suggestions to limit the possible harm are welcome.
Ok, that was sent before morning coffee, not really the whole story... What
I should have said is: Can you expand on the possible problems (keeping in
mind that I don't know much about arm in general or how thumb might relate
to this)?
I did build 4.2.1 successfully for qemuarm and it seems ok in a very quick
test.
- Jussi
[-- Attachment #2: Type: text/html, Size: 1842 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-29 6:17 ` Jussi Kukkonen
@ 2015-08-29 8:43 ` Martin Jansa
2015-08-29 10:18 ` Richard Purdie
0 siblings, 1 reply; 26+ messages in thread
From: Martin Jansa @ 2015-08-29 8:43 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1951 bytes --]
Did you enable thumb in that qemuarm build?
It's disabled by default and multiple components are broken when you enable
it, see:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
On Sat, Aug 29, 2015 at 8:17 AM, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:
> On 28 August 2015 at 10:44, Jussi Kukkonen <jussi.kukkonen@intel.com>
> wrote:
> > On 28 August 2015 at 09:03, Khem Raj <raj.khem@gmail.com> wrote:
> > > > On Aug 27, 2015, at 6:05 AM, Jussi Kukkonen <
> jussi.kukkonen@intel.com> wrote:
> > > >
> > > > gmp 4.2.1 was removed in f181c6ce8b apparently accidentally: It
> > > > was not noticed that 4.2.1 is LGPL 2.1 (and not GPL) so provides
> > > > a useful alternative to the newer "GPLv2 | LGPLv3" version.
> > > >
> > > > * Reintroduce 4.2.1. The source includes files that are GPL but the
> > > > library package is LGPL 2.1+
> > > > * Also reintroduce the two patches removed in f181c6ce8b.
> > > > * Refactor gmp.inc: gmp 6.0.0 build should not be affected in any
> way.
> > > > * Update 6.0.0 license from "GPLv2 | LGPLv3" to "GPLv2+ | LGPLv3+".
> > > >
> > > > [YOCTO #8197]
> > >
> > > there are issues with gmp on arm especially thumb mode. What kind of
> testing have you done on this ?
> >
> > I have not tested on arm and at don't really have means to do so.
> Suggestions to limit the possible harm are welcome.
>
> Ok, that was sent before morning coffee, not really the whole story...
> What I should have said is: Can you expand on the possible problems
> (keeping in mind that I don't know much about arm in general or how thumb
> might relate to this)?
>
> I did build 4.2.1 successfully for qemuarm and it seems ok in a very quick
> test.
>
> - Jussi
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
[-- Attachment #2: Type: text/html, Size: 3043 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-29 8:43 ` Martin Jansa
@ 2015-08-29 10:18 ` Richard Purdie
2015-08-31 13:22 ` Otavio Salvador
0 siblings, 1 reply; 26+ messages in thread
From: Richard Purdie @ 2015-08-29 10:18 UTC (permalink / raw)
To: Martin Jansa; +Cc: Patches and discussions about the oe-core layer
On Sat, 2015-08-29 at 10:43 +0200, Martin Jansa wrote:
> Did you enable thumb in that qemuarm build?
>
>
> It's disabled by default and multiple components are broken when you
> enable it, see:
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
I'm going to draw a line here. People are asking that the old version of
gmp be brought back due license issues, fine. It doesn't mean that all
the bugs in said old release should be fixed.
If thumb on arm with old gmp is an issue for people, I'd suggest that
those people figure out which patches are needed and send the patches.
Asking Jussi to deal with this isn't right/fair though.
Cheers,
Richard
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-29 10:18 ` Richard Purdie
@ 2015-08-31 13:22 ` Otavio Salvador
2015-08-31 13:53 ` Richard Purdie
2015-08-31 15:21 ` Martin Jansa
0 siblings, 2 replies; 26+ messages in thread
From: Otavio Salvador @ 2015-08-31 13:22 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Sat, Aug 29, 2015 at 7:18 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Sat, 2015-08-29 at 10:43 +0200, Martin Jansa wrote:
>> Did you enable thumb in that qemuarm build?
>>
>>
>> It's disabled by default and multiple components are broken when you
>> enable it, see:
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
>
> I'm going to draw a line here. People are asking that the old version of
> gmp be brought back due license issues, fine. It doesn't mean that all
> the bugs in said old release should be fixed.
>
> If thumb on arm with old gmp is an issue for people, I'd suggest that
> those people figure out which patches are needed and send the patches.
> Asking Jussi to deal with this isn't right/fair though.
I disagree. If it will be merged it ought to support what we are
testing nowadays otherwise the backlog will be kept growing forever...
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-31 13:22 ` Otavio Salvador
@ 2015-08-31 13:53 ` Richard Purdie
2015-08-31 14:01 ` Otavio Salvador
2015-08-31 14:38 ` Khem Raj
2015-08-31 15:21 ` Martin Jansa
1 sibling, 2 replies; 26+ messages in thread
From: Richard Purdie @ 2015-08-31 13:53 UTC (permalink / raw)
To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer
On Mon, 2015-08-31 at 10:22 -0300, Otavio Salvador wrote:
> On Sat, Aug 29, 2015 at 7:18 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Sat, 2015-08-29 at 10:43 +0200, Martin Jansa wrote:
> >> Did you enable thumb in that qemuarm build?
> >>
> >>
> >> It's disabled by default and multiple components are broken when you
> >> enable it, see:
> >> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
> >
> > I'm going to draw a line here. People are asking that the old version of
> > gmp be brought back due license issues, fine. It doesn't mean that all
> > the bugs in said old release should be fixed.
> >
> > If thumb on arm with old gmp is an issue for people, I'd suggest that
> > those people figure out which patches are needed and send the patches.
> > Asking Jussi to deal with this isn't right/fair though.
>
> I disagree. If it will be merged it ought to support what we are
> testing nowadays otherwise the backlog will be kept growing forever...
We cannot reasonably expect Jussi to do this work.
OE needs to move onward, be it with kernel versions, compiler versions
or library versions since not to do so effectively will result in OE
becoming obsolete and out of touch.
The GNU world moving to *GPLv3 is unfortunate in some ways but isn't
something I/we have any choice over.
We have a commitment right now to have some older licenced recipes. To
make those work, *someone* is going to have to step up and work on them.
Who is going to do it?
By your comment, I should just refuse the old gmp version entirely?
Cheers,
Richard
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-31 13:53 ` Richard Purdie
@ 2015-08-31 14:01 ` Otavio Salvador
2015-08-31 14:10 ` Alexander Kanavin
2015-08-31 14:38 ` Khem Raj
1 sibling, 1 reply; 26+ messages in thread
From: Otavio Salvador @ 2015-08-31 14:01 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Mon, Aug 31, 2015 at 10:53 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2015-08-31 at 10:22 -0300, Otavio Salvador wrote:
>> On Sat, Aug 29, 2015 at 7:18 AM, Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>> > On Sat, 2015-08-29 at 10:43 +0200, Martin Jansa wrote:
>> >> Did you enable thumb in that qemuarm build?
>> >>
>> >>
>> >> It's disabled by default and multiple components are broken when you
>> >> enable it, see:
>> >> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
>> >
>> > I'm going to draw a line here. People are asking that the old version of
>> > gmp be brought back due license issues, fine. It doesn't mean that all
>> > the bugs in said old release should be fixed.
>> >
>> > If thumb on arm with old gmp is an issue for people, I'd suggest that
>> > those people figure out which patches are needed and send the patches.
>> > Asking Jussi to deal with this isn't right/fair though.
>>
>> I disagree. If it will be merged it ought to support what we are
>> testing nowadays otherwise the backlog will be kept growing forever...
>
> We cannot reasonably expect Jussi to do this work.
>
> OE needs to move onward, be it with kernel versions, compiler versions
> or library versions since not to do so effectively will result in OE
> becoming obsolete and out of touch.
>
> The GNU world moving to *GPLv3 is unfortunate in some ways but isn't
> something I/we have any choice over.
>
> We have a commitment right now to have some older licenced recipes. To
> make those work, *someone* is going to have to step up and work on them.
> Who is going to do it?
Well ... people wishing to use it needs to step up.
> By your comment, I should just refuse the old gmp version entirely?
Until proper fixed, yes.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-31 14:01 ` Otavio Salvador
@ 2015-08-31 14:10 ` Alexander Kanavin
0 siblings, 0 replies; 26+ messages in thread
From: Alexander Kanavin @ 2015-08-31 14:10 UTC (permalink / raw)
To: openembedded-core
On 08/31/2015 05:01 PM, Otavio Salvador wrote:
>> By your comment, I should just refuse the old gmp version entirely?
>
> Until proper fixed, yes.
I disagree with this. If gmp isn't working on a specific hardware
platform, but is just fine on the others, that is not sufficient grounds
for altogether excluding the recipe from the recipe repository.
The recipe can be disabled in builds for that architecture, until
someone steps up to fix the problem later. Webkit was broken for a very
long time on MIPS64, so by your logic, we shouldn't have had webkit at all?
Alex
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-31 13:53 ` Richard Purdie
2015-08-31 14:01 ` Otavio Salvador
@ 2015-08-31 14:38 ` Khem Raj
2015-09-01 11:21 ` Jussi Kukkonen
1 sibling, 1 reply; 26+ messages in thread
From: Khem Raj @ 2015-08-31 14:38 UTC (permalink / raw)
To: Richard Purdie
Cc: Otavio Salvador, Patches and discussions about the oe-core layer
On Mon, Aug 31, 2015 at 6:53 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2015-08-31 at 10:22 -0300, Otavio Salvador wrote:
>> On Sat, Aug 29, 2015 at 7:18 AM, Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>> > On Sat, 2015-08-29 at 10:43 +0200, Martin Jansa wrote:
>> >> Did you enable thumb in that qemuarm build?
>> >>
>> >>
>> >> It's disabled by default and multiple components are broken when you
>> >> enable it, see:
>> >> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
>> >
>> > I'm going to draw a line here. People are asking that the old version of
>> > gmp be brought back due license issues, fine. It doesn't mean that all
>> > the bugs in said old release should be fixed.
>> >
>> > If thumb on arm with old gmp is an issue for people, I'd suggest that
>> > those people figure out which patches are needed and send the patches.
>> > Asking Jussi to deal with this isn't right/fair though.
>>
>> I disagree. If it will be merged it ought to support what we are
>> testing nowadays otherwise the backlog will be kept growing forever...
>
> We cannot reasonably expect Jussi to do this work.
>
> OE needs to move onward, be it with kernel versions, compiler versions
> or library versions since not to do so effectively will result in OE
> becoming obsolete and out of touch.
>
> The GNU world moving to *GPLv3 is unfortunate in some ways but isn't
> something I/we have any choice over.
>
> We have a commitment right now to have some older licenced recipes. To
> make those work, *someone* is going to have to step up and work on them.
> Who is going to do it?
>
> By your comment, I should just refuse the old gmp version entirely?
There is alternative suggestion. I think all this is happening for
nettle which we have GPLv2 version in core. There doesnt seem to be a
full use of libgmp elsewhere.
nettle can be built using mini-gmp, as well I think that route should
be explored. That also keeps the us honest with our motive of moving
all
gplv2 legacy packages to layer of its own in future.
>
> Cheers,
>
> Richard
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-31 14:38 ` Khem Raj
@ 2015-09-01 11:21 ` Jussi Kukkonen
2015-09-01 14:45 ` Khem Raj
0 siblings, 1 reply; 26+ messages in thread
From: Jussi Kukkonen @ 2015-09-01 11:21 UTC (permalink / raw)
To: Khem Raj; +Cc: Otavio Salvador, Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 924 bytes --]
On 31 August 2015 at 17:38, Khem Raj <raj.khem@gmail.com> wrote:
> There is alternative suggestion. I think all this is happening for
> nettle which we have GPLv2 version in core. There doesnt seem to be a
> full use of libgmp elsewhere.
> nettle can be built using mini-gmp, as well I think that route should
> be explored. That also keeps the us honest with our motive of moving
> all gplv2 legacy packages to layer of its own in future.
Is it actually possible to build a working LGPL2 version of nettle with
mini-gmp? I did look at that option (and the "--with-mini-nettle" option
for gnutls) but couldn't figure it out.
With our current nettle (2.7.1) the problems are
A) it doesn't actually have a "--enable-mini-gmp" option: only one test
binary seems use mini-gmp
B) the gmp files that are included are actually LGPL3 (so even if we could
use them, it would not help the end goal much)
- Jussi
[-- Attachment #2: Type: text/html, Size: 1075 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-09-01 11:21 ` Jussi Kukkonen
@ 2015-09-01 14:45 ` Khem Raj
0 siblings, 0 replies; 26+ messages in thread
From: Khem Raj @ 2015-09-01 14:45 UTC (permalink / raw)
To: Jussi Kukkonen
Cc: Otavio Salvador, Patches and discussions about the oe-core layer
On Tue, Sep 1, 2015 at 4:21 AM, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
> On 31 August 2015 at 17:38, Khem Raj <raj.khem@gmail.com> wrote:
>> There is alternative suggestion. I think all this is happening for
>> nettle which we have GPLv2 version in core. There doesnt seem to be a
>> full use of libgmp elsewhere.
>> nettle can be built using mini-gmp, as well I think that route should
>> be explored. That also keeps the us honest with our motive of moving
>> all gplv2 legacy packages to layer of its own in future.
>
> Is it actually possible to build a working LGPL2 version of nettle with
> mini-gmp? I did look at that option (and the "--with-mini-nettle" option for
> gnutls) but couldn't figure it out.
>
> With our current nettle (2.7.1) the problems are
> A) it doesn't actually have a "--enable-mini-gmp" option: only one test
> binary seems use mini-gmp
yes I did not consider its old version of gmp
> B) the gmp files that are included are actually LGPL3 (so even if we could
> use them, it would not help the end goal much)
Yes. Let merge it in. I would have preferred to call it gmp42 or
something in recipe
so it does not cause toolchain problems. but thats a combination of
GPLv2 building toolchain for target with whitelisting gcc and
binutils.
>
> - Jussi
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-31 13:22 ` Otavio Salvador
2015-08-31 13:53 ` Richard Purdie
@ 2015-08-31 15:21 ` Martin Jansa
2015-08-31 15:27 ` Khem Raj
1 sibling, 1 reply; 26+ messages in thread
From: Martin Jansa @ 2015-08-31 15:21 UTC (permalink / raw)
To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1550 bytes --]
On Mon, Aug 31, 2015 at 10:22:31AM -0300, Otavio Salvador wrote:
> On Sat, Aug 29, 2015 at 7:18 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Sat, 2015-08-29 at 10:43 +0200, Martin Jansa wrote:
> >> Did you enable thumb in that qemuarm build?
> >>
> >>
> >> It's disabled by default and multiple components are broken when you
> >> enable it, see:
> >> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
> >
> > I'm going to draw a line here. People are asking that the old version of
> > gmp be brought back due license issues, fine. It doesn't mean that all
> > the bugs in said old release should be fixed.
> >
> > If thumb on arm with old gmp is an issue for people, I'd suggest that
> > those people figure out which patches are needed and send the patches.
> > Asking Jussi to deal with this isn't right/fair though.
>
> I disagree. If it will be merged it ought to support what we are
> testing nowadays otherwise the backlog will be kept growing forever...
FWIW: I don't mind getting it merged as is.
It improves situation for non-GPLv3 builds and if there is issue with
thumb, then it was there before as well, so returning it doesn't make
things worse.
My previous reply was just to show that building default qemuarm doesn't
show anything, because thumb isn't enabled and gmp even isn't one of the
recipes which are failing with thumb-1, maybe Khem meant some issues in
runtime I don't know about.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-31 15:21 ` Martin Jansa
@ 2015-08-31 15:27 ` Khem Raj
2015-09-01 14:55 ` Mark Hatle
0 siblings, 1 reply; 26+ messages in thread
From: Khem Raj @ 2015-08-31 15:27 UTC (permalink / raw)
To: Martin Jansa
Cc: Otavio Salvador, Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1955 bytes --]
> On Aug 31, 2015, at 8:21 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> On Mon, Aug 31, 2015 at 10:22:31AM -0300, Otavio Salvador wrote:
>> On Sat, Aug 29, 2015 at 7:18 AM, Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>>> On Sat, 2015-08-29 at 10:43 +0200, Martin Jansa wrote:
>>>> Did you enable thumb in that qemuarm build?
>>>>
>>>>
>>>> It's disabled by default and multiple components are broken when you
>>>> enable it, see:
>>>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
>>>
>>> I'm going to draw a line here. People are asking that the old version of
>>> gmp be brought back due license issues, fine. It doesn't mean that all
>>> the bugs in said old release should be fixed.
>>>
>>> If thumb on arm with old gmp is an issue for people, I'd suggest that
>>> those people figure out which patches are needed and send the patches.
>>> Asking Jussi to deal with this isn't right/fair though.
>>
>> I disagree. If it will be merged it ought to support what we are
>> testing nowadays otherwise the backlog will be kept growing forever...
>
> FWIW: I don't mind getting it merged as is.
>
> It improves situation for non-GPLv3 builds and if there is issue with
> thumb, then it was there before as well, so returning it doesn't make
> things worse.
>
> My previous reply was just to show that building default qemuarm doesn't
> show anything, because thumb isn't enabled and gmp even isn't one of the
> recipes which are failing with thumb-1, maybe Khem meant some issues in
> runtime I don't know about.
It has issues working with thumb2 as well. Another problem it creates is building on-device toolchain
since gcc also depends on gmp and when you pin to older version of GMP, it starts to fail
Thats why I suggested to use mini-gmp ( same but reduced gmp ) can clear of this situation since it
will be a mini-gmp recipe and won’t interfere with toolchain.
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+)
2015-08-31 15:27 ` Khem Raj
@ 2015-09-01 14:55 ` Mark Hatle
2015-09-01 17:10 ` Khem Raj
0 siblings, 1 reply; 26+ messages in thread
From: Mark Hatle @ 2015-09-01 14:55 UTC (permalink / raw)
To: Khem Raj, Martin Jansa
Cc: Otavio Salvador, Patches and discussions about the oe-core layer
On 8/31/15 10:27 AM, Khem Raj wrote:
>
>> On Aug 31, 2015, at 8:21 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>>
>> On Mon, Aug 31, 2015 at 10:22:31AM -0300, Otavio Salvador wrote:
>>> On Sat, Aug 29, 2015 at 7:18 AM, Richard Purdie
>>> <richard.purdie@linuxfoundation.org> wrote:
>>>> On Sat, 2015-08-29 at 10:43 +0200, Martin Jansa wrote:
>>>>> Did you enable thumb in that qemuarm build?
>>>>>
>>>>>
>>>>> It's disabled by default and multiple components are broken when you
>>>>> enable it, see:
>>>>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
>>>>
>>>> I'm going to draw a line here. People are asking that the old version of
>>>> gmp be brought back due license issues, fine. It doesn't mean that all
>>>> the bugs in said old release should be fixed.
>>>>
>>>> If thumb on arm with old gmp is an issue for people, I'd suggest that
>>>> those people figure out which patches are needed and send the patches.
>>>> Asking Jussi to deal with this isn't right/fair though.
>>>
>>> I disagree. If it will be merged it ought to support what we are
>>> testing nowadays otherwise the backlog will be kept growing forever...
>>
>> FWIW: I don't mind getting it merged as is.
>>
>> It improves situation for non-GPLv3 builds and if there is issue with
>> thumb, then it was there before as well, so returning it doesn't make
>> things worse.
>>
>> My previous reply was just to show that building default qemuarm doesn't
>> show anything, because thumb isn't enabled and gmp even isn't one of the
>> recipes which are failing with thumb-1, maybe Khem meant some issues in
>> runtime I don't know about.
>
> It has issues working with thumb2 as well. Another problem it creates is building on-device toolchain
> since gcc also depends on gmp and when you pin to older version of GMP, it starts to fail
> Thats why I suggested to use mini-gmp ( same but reduced gmp ) can clear of this situation since it
> will be a mini-gmp recipe and won’t interfere with toolchain.
>
Do you have any sense of the problems when gcc uses an older version of GMP? If
a newer version is required for gcc -- then can gcc itself check that it's a
proper minimum version available? (At this point I would assume if someone is
worried about GPLv3 issues, that they would NOT be putting the compiler and
related tools on the target.) I know we can specify -runtime- minimum versions
easily enough using the > directive.. but I don't think there is an easy way to
specify minimum build version, other then verify we have the correct version
available to us though a file check of some kind.
--Mark
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 3/6] nettle: Add (LGPLv3) version 3.1.1
2015-08-27 13:05 [PATCH 0/6] Bring back LGPLv2 gmp, upgrade gnutls stack Jussi Kukkonen
2015-08-27 13:05 ` [PATCH 1/6] nettle: Fix binary license to LGPLv2.1+ Jussi Kukkonen
2015-08-27 13:05 ` [PATCH 2/6] gmp: Bring back version 4.2.1 (LGPL 2.1+) Jussi Kukkonen
@ 2015-08-27 13:06 ` Jussi Kukkonen
2015-08-27 13:06 ` [PATCH 4/6] nettle: Add ptests Jussi Kukkonen
` (2 subsequent siblings)
5 siblings, 0 replies; 26+ messages in thread
From: Jussi Kukkonen @ 2015-08-27 13:06 UTC (permalink / raw)
To: openembedded-core
Newer nettle versions are "LGPLv3+ | GPLv2+". Add 3.1.1 but also
keep version 2.7.1 since it's LGPLv2.1+
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-support/nettle/nettle.inc | 26 ++++++++++++++++++++++++++
meta/recipes-support/nettle/nettle_2.7.1.bb | 20 ++------------------
meta/recipes-support/nettle/nettle_3.1.1.bb | 11 +++++++++++
3 files changed, 39 insertions(+), 18 deletions(-)
create mode 100644 meta/recipes-support/nettle/nettle.inc
create mode 100644 meta/recipes-support/nettle/nettle_3.1.1.bb
diff --git a/meta/recipes-support/nettle/nettle.inc b/meta/recipes-support/nettle/nettle.inc
new file mode 100644
index 0000000..0579b6c
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle.inc
@@ -0,0 +1,26 @@
+SUMMARY = "A low level cryptographic library"
+HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
+SECTION = "libs"
+
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+ file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \
+ file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d"
+
+DEPENDS += "gmp"
+
+SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
+
+SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
+SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
+
+EXTRA_OECONF = "--disable-openssl"
+
+do_configure_prepend() {
+ if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
+ cp ${S}/aclocal.m4 ${S}/acinclude.m4
+ fi
+}
+
+inherit autotools
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/meta/recipes-support/nettle/nettle_2.7.1.bb
index 7823df9..ae2574a 100644
--- a/meta/recipes-support/nettle/nettle_2.7.1.bb
+++ b/meta/recipes-support/nettle/nettle_2.7.1.bb
@@ -1,6 +1,5 @@
-SUMMARY = "A low level cryptographic library"
-HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
-SECTION = "libs"
+require nettle.inc
+
LICENSE = "LGPLv2.1 & GPLv2"
LICENSE_${PN} = "LGPLv2.1+"
@@ -8,21 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \
file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d"
-DEPENDS += "gmp"
-
-SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
-
SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
-EXTRA_OECONF = "--disable-openssl"
-
-do_configure_prepend() {
- if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
- cp ${S}/aclocal.m4 ${S}/acinclude.m4
- fi
-}
-
-inherit autotools
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/nettle/nettle_3.1.1.bb b/meta/recipes-support/nettle/nettle_3.1.1.bb
new file mode 100644
index 0000000..7d7134f
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle_3.1.1.bb
@@ -0,0 +1,11 @@
+require nettle.inc
+
+LICENSE = "LGPLv3+ | GPLv2+"
+
+LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
+ file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \
+ file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e"
+
+SRC_URI[md5sum] = "b40fa88dc32f37a182b6b42092ebb144"
+SRC_URI[sha256sum] = "5fd4d25d64d8ddcb85d0d897572af73b05b4d163c6cc49438a5bfbb8ff293d4c"
--
2.1.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 4/6] nettle: Add ptests
2015-08-27 13:05 [PATCH 0/6] Bring back LGPLv2 gmp, upgrade gnutls stack Jussi Kukkonen
` (2 preceding siblings ...)
2015-08-27 13:06 ` [PATCH 3/6] nettle: Add (LGPLv3) version 3.1.1 Jussi Kukkonen
@ 2015-08-27 13:06 ` Jussi Kukkonen
2015-08-28 12:16 ` Jussi Kukkonen
2015-08-27 13:06 ` [PATCH 5/6] gnutls: Upgrade 3.3.14 -> 3.3.17.1 Jussi Kukkonen
2015-08-27 13:06 ` [PATCH 6/6] mirrors.bbclass: Update gnutls mirrors Jussi Kukkonen
5 siblings, 1 reply; 26+ messages in thread
From: Jussi Kukkonen @ 2015-08-27 13:06 UTC (permalink / raw)
To: openembedded-core
Use the nettle testsuite as ptests. Skip "sha1-huge-test" because
it can take 20 minutes to finish.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...d-target-to-only-build-tests-not-run-them.patch | 43 ++++++++++++++++++++++
meta/recipes-support/nettle/files/run-ptest | 36 ++++++++++++++++++
meta/recipes-support/nettle/nettle.inc | 21 ++++++++++-
3 files changed, 98 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
create mode 100644 meta/recipes-support/nettle/files/run-ptest
diff --git a/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch b/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
new file mode 100644
index 0000000..9495d02
--- /dev/null
+++ b/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
@@ -0,0 +1,43 @@
+From 46edf01cc98db9f9feec984897836dfdd26bdc8d Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 12 Aug 2015 23:27:27 +0300
+Subject: [PATCH] Add target to only build tests (not run them)
+
+Upstream-Status: ?
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ Makefile.in | 3 +++
+ testsuite/Makefile.in | 2 ++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 08efb7d..7909342 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-clean tags:
+ echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
+ $(MAKE) $@-here
+
++buildtest:
++ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@)
++
+ check-here:
+ true
+
+diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
+index 6bc1907..bb65bf0 100644
+--- a/testsuite/Makefile.in
++++ b/testsuite/Makefile.in
+@@ -116,6 +116,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
+ # data.
+ VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
+
++buildtest: $(TS_ALL)
++
+ # The PATH update is for locating dlls on w*ndows.
+ check: $(TS_ALL)
+ LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
+--
+2.1.4
+
diff --git a/meta/recipes-support/nettle/files/run-ptest b/meta/recipes-support/nettle/files/run-ptest
new file mode 100644
index 0000000..b90bed6
--- /dev/null
+++ b/meta/recipes-support/nettle/files/run-ptest
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+cd testsuite
+
+failed=0
+all=0
+
+for f in *-test; do
+ if [ "$f" = "sha1-huge-test" ] ; then
+ echo "SKIP: $f (skipped for ludicrous run time)"
+ continue
+ fi
+
+ "./$f"
+ case "$?" in
+ 0)
+ echo "PASS: $f"
+ all=$((all + 1))
+ ;;
+ 77)
+ echo "SKIP: $f"
+ ;;
+ *)
+ echo "FAIL: $f"
+ failed=$((failed + 1))
+ all=$((all + 1))
+ ;;
+ esac
+done
+
+if [ "$failed" -eq 0 ] ; then
+ echo "All $all tests passed"
+else
+ echo "$failed of $all tests failed"
+fi
+
diff --git a/meta/recipes-support/nettle/nettle.inc b/meta/recipes-support/nettle/nettle.inc
index 0579b6c..fafff6d 100644
--- a/meta/recipes-support/nettle/nettle.inc
+++ b/meta/recipes-support/nettle/nettle.inc
@@ -8,19 +8,36 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
DEPENDS += "gmp"
-SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
+SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \
+ file://Add-target-to-only-build-tests-not-run-them.patch \
+ file://run-ptest \
+ "
SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
EXTRA_OECONF = "--disable-openssl"
+inherit autotools ptest
+
do_configure_prepend() {
if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
cp ${S}/aclocal.m4 ${S}/acinclude.m4
fi
}
-inherit autotools
+do_compile_ptest() {
+ oe_runmake buildtest
+}
+
+do_install_ptest() {
+ install -d ${D}${PTEST_PATH}/testsuite/
+ install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/
+ install ${S}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/
+ # tools can be found in PATH, not in ../tools/
+ sed -i -e 's|../tools/||' ${D}${PTEST_PATH}/testsuite/*-test
+ install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/
+}
+
BBCLASSEXTEND = "native nativesdk"
--
2.1.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 4/6] nettle: Add ptests
2015-08-27 13:06 ` [PATCH 4/6] nettle: Add ptests Jussi Kukkonen
@ 2015-08-28 12:16 ` Jussi Kukkonen
0 siblings, 0 replies; 26+ messages in thread
From: Jussi Kukkonen @ 2015-08-28 12:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 5351 bytes --]
On 27 August 2015 at 16:06, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
>
> Use the nettle testsuite as ptests. Skip "sha1-huge-test" because
> it can take 20 minutes to finish.
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
> ...d-target-to-only-build-tests-not-run-them.patch | 43
++++++++++++++++++++++
> meta/recipes-support/nettle/files/run-ptest | 36
++++++++++++++++++
> meta/recipes-support/nettle/nettle.inc | 21 ++++++++++-
> 3 files changed, 98 insertions(+), 2 deletions(-)
> create mode 100644
meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
> create mode 100644 meta/recipes-support/nettle/files/run-ptest
>
> diff --git
a/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
b/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
> new file mode 100644
> index 0000000..9495d02
> --- /dev/null
> +++
b/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
> @@ -0,0 +1,43 @@
> +From 46edf01cc98db9f9feec984897836dfdd26bdc8d Mon Sep 17 00:00:00 2001
> +From: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +Date: Wed, 12 Aug 2015 23:27:27 +0300
> +Subject: [PATCH] Add target to only build tests (not run them)
> +
> +Upstream-Status: ?
I've changed this to "Inappropriate" in the branch: it's not a complete
patch for installable tests (that upstream might be interested in) but it's
already useful for us.
> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +---
> + Makefile.in | 3 +++
> + testsuite/Makefile.in | 2 ++
> + 2 files changed, 5 insertions(+)
> +
> +diff --git a/Makefile.in b/Makefile.in
> +index 08efb7d..7909342 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> +@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-clean tags:
> + echo "Making $@ in $d" ; (cd $d && $(MAKE) $@); done
> + $(MAKE) $@-here
> +
> ++buildtest:
> ++ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@)
> ++
> + check-here:
> + true
> +
> +diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
> +index 6bc1907..bb65bf0 100644
> +--- a/testsuite/Makefile.in
> ++++ b/testsuite/Makefile.in
> +@@ -116,6 +116,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT)
../nettle-internal.$(OBJEXT) \
> + # data.
> + VALGRIND = valgrind --error-exitcode=1 --leak-check=full
--show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
> +
> ++buildtest: $(TS_ALL)
> ++
> + # The PATH update is for locating dlls on w*ndows.
> + check: $(TS_ALL)
> + LD_LIBRARY_PATH=../.lib PATH="../.lib:$PATH" srcdir="$(srcdir)" \
> +--
> +2.1.4
> +
> diff --git a/meta/recipes-support/nettle/files/run-ptest
b/meta/recipes-support/nettle/files/run-ptest
> new file mode 100644
> index 0000000..b90bed6
> --- /dev/null
> +++ b/meta/recipes-support/nettle/files/run-ptest
> @@ -0,0 +1,36 @@
> +#! /bin/sh
> +
> +cd testsuite
> +
> +failed=0
> +all=0
> +
> +for f in *-test; do
> + if [ "$f" = "sha1-huge-test" ] ; then
> + echo "SKIP: $f (skipped for ludicrous run time)"
> + continue
> + fi
> +
> + "./$f"
> + case "$?" in
> + 0)
> + echo "PASS: $f"
> + all=$((all + 1))
> + ;;
> + 77)
> + echo "SKIP: $f"
> + ;;
> + *)
> + echo "FAIL: $f"
> + failed=$((failed + 1))
> + all=$((all + 1))
> + ;;
> + esac
> +done
> +
> +if [ "$failed" -eq 0 ] ; then
> + echo "All $all tests passed"
> +else
> + echo "$failed of $all tests failed"
> +fi
> +
> diff --git a/meta/recipes-support/nettle/nettle.inc
b/meta/recipes-support/nettle/nettle.inc
> index 0579b6c..fafff6d 100644
> --- a/meta/recipes-support/nettle/nettle.inc
> +++ b/meta/recipes-support/nettle/nettle.inc
> @@ -8,19 +8,36 @@ LIC_FILES_CHKSUM =
"file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>
> DEPENDS += "gmp"
>
> -SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
> +SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \
> + file://Add-target-to-only-build-tests-not-run-them.patch \
> + file://run-ptest \
> + "
>
> SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
> SRC_URI[sha256sum] =
"bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
>
> EXTRA_OECONF = "--disable-openssl"
>
> +inherit autotools ptest
> +
> do_configure_prepend() {
> if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
> cp ${S}/aclocal.m4 ${S}/acinclude.m4
> fi
> }
>
> -inherit autotools
> +do_compile_ptest() {
> + oe_runmake buildtest
> +}
> +
> +do_install_ptest() {
> + install -d ${D}${PTEST_PATH}/testsuite/
> + install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/
> + install ${S}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/
> + # tools can be found in PATH, not in ../tools/
> + sed -i -e 's|../tools/||' ${D}${PTEST_PATH}/testsuite/*-test
> + install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/
> +}
> +
>
> BBCLASSEXTEND = "native nativesdk"
> --
> 2.1.4
>
[-- Attachment #2: Type: text/html, Size: 6935 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 5/6] gnutls: Upgrade 3.3.14 -> 3.3.17.1
2015-08-27 13:05 [PATCH 0/6] Bring back LGPLv2 gmp, upgrade gnutls stack Jussi Kukkonen
` (3 preceding siblings ...)
2015-08-27 13:06 ` [PATCH 4/6] nettle: Add ptests Jussi Kukkonen
@ 2015-08-27 13:06 ` Jussi Kukkonen
2015-08-27 13:06 ` [PATCH 6/6] mirrors.bbclass: Update gnutls mirrors Jussi Kukkonen
5 siblings, 0 replies; 26+ messages in thread
From: Jussi Kukkonen @ 2015-08-27 13:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-support/gnutls/{gnutls_3.3.14.bb => gnutls_3.3.17.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/gnutls/{gnutls_3.3.14.bb => gnutls_3.3.17.1.bb} (59%)
diff --git a/meta/recipes-support/gnutls/gnutls_3.3.14.bb b/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb
similarity index 59%
rename from meta/recipes-support/gnutls/gnutls_3.3.14.bb
rename to meta/recipes-support/gnutls/gnutls_3.3.17.1.bb
index f41d183..0185797 100644
--- a/meta/recipes-support/gnutls/gnutls_3.3.14.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb
@@ -4,5 +4,5 @@ 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] = "7f4465f8c564cf9cb8f5cb38b909f7ca"
-SRC_URI[sha256sum] = "0dfa0030faad8909c1e904105198232d6bc0123cae8cf4933b2bac85ee7cec52"
+SRC_URI[md5sum] = "8d01c7e7f2cbc5871fdca832d2260b6b"
+SRC_URI[sha256sum] = "b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4"
--
2.1.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 6/6] mirrors.bbclass: Update gnutls mirrors
2015-08-27 13:05 [PATCH 0/6] Bring back LGPLv2 gmp, upgrade gnutls stack Jussi Kukkonen
` (4 preceding siblings ...)
2015-08-27 13:06 ` [PATCH 5/6] gnutls: Upgrade 3.3.14 -> 3.3.17.1 Jussi Kukkonen
@ 2015-08-27 13:06 ` Jussi Kukkonen
2015-08-27 17:13 ` Christopher Larson
5 siblings, 1 reply; 26+ messages in thread
From: Jussi Kukkonen @ 2015-08-27 13:06 UTC (permalink / raw)
To: openembedded-core
* Remove mirror sites that no longer exist
* Update the gnutls.org path so the gnupg mirror gets used
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/classes/mirrors.bbclass | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index 081c982..b96c071 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -27,10 +27,7 @@ ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/ \n \
ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \
ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ \n \
ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \
-ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ \n \
-ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \n \
-ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \n \
-ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ \n \
+ftp://ftp.gnutls.org/gcrypt/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ \n \
http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ \n \
http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ \n \
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \n \
--
2.1.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 6/6] mirrors.bbclass: Update gnutls mirrors
2015-08-27 13:06 ` [PATCH 6/6] mirrors.bbclass: Update gnutls mirrors Jussi Kukkonen
@ 2015-08-27 17:13 ` Christopher Larson
2015-08-31 11:27 ` Richard Purdie
0 siblings, 1 reply; 26+ messages in thread
From: Christopher Larson @ 2015-08-27 17:13 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 587 bytes --]
On Thu, Aug 27, 2015 at 6:06 AM, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:
> * Remove mirror sites that no longer exist
> * Update the gnutls.org path so the gnupg mirror gets used
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
>
Hmm, I can't help but wonder if these app-specific mirrors should be moved
to the recipes or classes that need them, rather than in the global default
MIRRORS..
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1105 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 6/6] mirrors.bbclass: Update gnutls mirrors
2015-08-27 17:13 ` Christopher Larson
@ 2015-08-31 11:27 ` Richard Purdie
0 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2015-08-31 11:27 UTC (permalink / raw)
To: Christopher Larson; +Cc: Patches and discussions about the oe-core layer
On Thu, 2015-08-27 at 10:13 -0700, Christopher Larson wrote:
>
> On Thu, Aug 27, 2015 at 6:06 AM, Jussi Kukkonen
> <jussi.kukkonen@intel.com> wrote:
> * Remove mirror sites that no longer exist
> * Update the gnutls.org path so the gnupg mirror gets used
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
>
> Hmm, I can't help but wonder if these app-specific mirrors should be
> moved to the recipes or classes that need them, rather than in the
> global default MIRRORS..
I do share that view for recipe specific entries like this. I will merge
the patch as it fixes broken things though.
Cheers,
Richard
^ permalink raw reply [flat|nested] 26+ messages in thread