[PATCH v2 1/1] gnutls: avoid accidentally using libseccomp

[PATCH v2 1/1] gnutls: avoid accidentally using libseccomp

[Joe Slater]

Specify whether to use libseccomp or not.  Do not
just let configure check for it.

Signed-off-by: Joe Slater <jslater@windriver.com>
---
 meta/recipes-support/gnutls/gnutls.inc            |   12 ++++++++++++
 meta/recipes-support/gnutls/gnutls/arm_eabi.patch |    2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 003dc55..14fcdca 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -21,6 +21,17 @@ SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
 
 inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc
 
+# We cannot use PACKAGECONFIG for this since there is no controlling
+# configure option.
+#
+# To use seccomp, uncomment the two variables.  You must also
+# have CONFIG_SECCOMP enabled in the kernel.
+#
+#DEPENDS_append_class-target = " libseccomp"
+#lcl_LIBSECCOMP_class-target = "ac_cv_libseccomp=yes"
+
+lcl_LIBSECCOMP ?= "ac_cv_libseccomp=no"
+
 PACKAGECONFIG ??= "libidn zlib"
 
 PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn"
@@ -38,6 +49,7 @@ EXTRA_OECONF = " \
     --enable-openssl-compatibility \
     --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
     --without-libunistring-prefix \
+    ${lcl_LIBSECCOMP} \
 "
 
 LDFLAGS_append_libc-musl = " -largp"
diff --git a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
index 8bf06f1..34c8985 100644
--- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
+++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
@@ -1,7 +1,7 @@
 Certain syscall's are not availabe for arm-eabi, so we eliminate
 reference to them.
 
-Upstream-status: pending
+Upstream-Status: Pending
 
 Signed-off-by: Joe Slater <jslater@windriver.com>
 
-- 
1.7.9.5

✗ patchtest: failure for [v2,1/1] gnutls: avoid accidentally using libseccomp

[Patchwork]

== Series Details ==

Series: [v2,1/1] gnutls: avoid accidentally using libseccomp
Revision: 1
URL   : https://patchwork.openembedded.org/series/4947/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 40463f9d80)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH v2 1/1] gnutls: avoid accidentally using libseccomp

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 434 bytes --]

On 24 January 2017 at 23:56, Joe Slater <jslater@windriver.com> wrote:

> --- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
> +++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
> @@ -1,7 +1,7 @@
>  Certain syscall's are not availabe for arm-eabi, so we eliminate
>  reference to them.
>
> -Upstream-status: pending
> +Upstream-Status: Pending
>

Looks like you squashed the fix into the wrong patch...

Ross

[-- Attachment #2: Type: text/html, Size: 869 bytes --]