From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- poky/meta/recipes-support/gnutls/gnutls.inc | 59 ++++++++++++++++++++ .../gnutls/0001-configure.ac-fix-sed-command.patch | 29 ++++++++++ .../recipes-support/gnutls/gnutls/arm_eabi.patch | 19 +++++++ poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb | 9 ++++ ...reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch | 63 ++++++++++++++++++++++ .../gnutls/libtasn1/dont-depend-on-help2man.patch | 14 +++++ poky/meta/recipes-support/gnutls/libtasn1_4.13.bb | 23 ++++++++ 7 files changed, 216 insertions(+) create mode 100644 poky/meta/recipes-support/gnutls/gnutls.inc create mode 100644 poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch create mode 100644 poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch create mode 100644 poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb create mode 100644 poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch create mode 100644 poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch create mode 100644 poky/meta/recipes-support/gnutls/libtasn1_4.13.bb (limited to 'poky/meta/recipes-support/gnutls') diff --git a/poky/meta/recipes-support/gnutls/gnutls.inc b/poky/meta/recipes-support/gnutls/gnutls.inc new file mode 100644 index 000000000..7bcb9133a --- /dev/null +++ b/poky/meta/recipes-support/gnutls/gnutls.inc @@ -0,0 +1,59 @@ +SUMMARY = "GNU Transport Layer Security Library" +HOMEPAGE = "http://www.gnu.org/software/gnutls/" +BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" + +LICENSE = "GPLv3+ & LGPLv2.1+" +LICENSE_${PN} = "LGPLv2.1+" +LICENSE_${PN}-xx = "LGPLv2.1+" +LICENSE_${PN}-bin = "GPLv3+" +LICENSE_${PN}-openssl = "GPLv3+" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ + file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" + +DEPENDS = "nettle gmp virtual/libiconv libunistring" +DEPENDS_append_libc-musl = " argp-standalone" + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +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 + +PACKAGECONFIG ??= "libidn" + +# You must also have CONFIG_SECCOMP enabled in the kernel for +# seccomp to work. +# +PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp" + +PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" +PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" +PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" +PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" + +EXTRA_OECONF = " \ + --enable-doc \ + --disable-libdane \ + --disable-guile \ + --disable-rpath \ + --enable-local-libopts \ + --enable-openssl-compatibility \ + --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ + --without-libunistring-prefix \ +" + +LDFLAGS_append_libc-musl = " -largp" + +do_configure_prepend() { + for dir in . lib; do + rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 + done +} + +PACKAGES =+ "${PN}-openssl ${PN}-xx" + +FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" +FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" +FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" diff --git a/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch new file mode 100644 index 000000000..b6e7bc965 --- /dev/null +++ b/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch @@ -0,0 +1,29 @@ +From eaab55bb6d48643163eebbc9ca575a9ca2a8e03f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 21 Feb 2017 17:10:07 +0200 +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 +Signed-off-by: Alexander Kanavin +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gnutls-3.5.16/configure.ac +=================================================================== +--- gnutls-3.5.16.orig/configure.ac ++++ gnutls-3.5.16/configure.ac +@@ -955,7 +955,7 @@ YEAR=`date +%Y` + AC_SUBST([YEAR], $YEAR) + + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=$(basename $i|sed 's/.bak//g') ++ nam=$(basename $i|sed 's/\.bak$//') + if test "$create_libopts_links" = "yes";then + rm -f "src/$nam.stamp" + rm -f "src/$nam" diff --git a/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch new file mode 100644 index 000000000..34c8985c1 --- /dev/null +++ b/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch @@ -0,0 +1,19 @@ +Certain syscall's are not availabe for arm-eabi, so we eliminate +reference to them. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater + +--- a/tests/seccomp.c ++++ b/tests/seccomp.c +@@ -49,7 +49,9 @@ int disable_system_calls(void) + } + + ADD_SYSCALL(nanosleep, 0); ++#if ! defined(__ARM_EABI__) + ADD_SYSCALL(time, 0); ++#endif + ADD_SYSCALL(getpid, 0); + ADD_SYSCALL(gettimeofday, 0); + #if defined(HAVE_CLOCK_GETTIME) diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb new file mode 100644 index 000000000..7624a203d --- /dev/null +++ b/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb @@ -0,0 +1,9 @@ +require gnutls.inc + +SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \ + file://arm_eabi.patch \ + " +SRC_URI[md5sum] = "4b65ae3ffef59f3eeed51a6166ff12b3" +SRC_URI[sha256sum] = "20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch b/poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch new file mode 100644 index 000000000..1e52d6abf --- /dev/null +++ b/poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch @@ -0,0 +1,63 @@ +From b17dbb8d3c5605db3a1d82861fcaeef4636d1117 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" +Date: Thu, 26 Jan 2017 18:54:48 +0200 +Subject: [PATCH] stdint.m4: reintroduce GNULIB_OVERRIDES_WINT_T check + +Partially revert the gnulib commit: 5a400b3f5a1f5483dbfd75d38bdb7080218a063b +to fix the build error with musl library. + +Upstream-Status: Inappropriate + +Signed-off-by: Maxin B. John +--- + gl/m4/stdint.m4 | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4 +index 4ac854d..3dc3da1 100644 +--- a/gl/m4/stdint.m4 ++++ b/gl/m4/stdint.m4 +@@ -355,6 +355,32 @@ int32_t i32 = INT32_C (0x7fffffff); + gl_STDINT_TYPE_PROPERTIES + fi + ++ dnl Determine whether gnulib's or would, if present, ++ dnl override 'wint_t'. ++ AC_CACHE_CHECK([whether wint_t is too small], ++ [gl_cv_type_wint_t_too_small], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[ ++ /* Tru64 with Desktop Toolkit C has a bug: must be included before ++ . ++ BSD/OS 4.0.1 has a bug: , and must be ++ included before . */ ++ #if !(defined __GLIBC__ && !defined __UCLIBC__) ++ # include ++ # include ++ # include ++ #endif ++ #include ++ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; ++ ]])], ++ [gl_cv_type_wint_t_too_small=no], ++ [gl_cv_type_wint_t_too_small=yes])]) ++ if test $gl_cv_type_wint_t_too_small = yes; then ++ GNULIB_OVERRIDES_WINT_T=1 ++ else ++ GNULIB_OVERRIDES_WINT_T=0 ++ fi ++ + dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. + LIMITS_H=limits.h + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) +@@ -363,6 +389,7 @@ int32_t i32 = INT32_C (0x7fffffff); + AC_SUBST([HAVE_SYS_BITYPES_H]) + AC_SUBST([HAVE_SYS_INTTYPES_H]) + AC_SUBST([STDINT_H]) ++ AC_SUBST([GNULIB_OVERRIDES_WINT_T]) + AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"]) + ]) + +-- +2.4.0 + diff --git a/poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch b/poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch new file mode 100644 index 000000000..2ac89f3b3 --- /dev/null +++ b/poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate + +Signed-off-by: Marko Lindqvist +diff -Nurd libtasn1-2.14/doc/Makefile.am libtasn1-2.14/doc/Makefile.am +--- libtasn1-2.14/doc/Makefile.am 2012-09-24 15:08:42.000000000 +0300 ++++ libtasn1-2.14/doc/Makefile.am 2013-01-03 07:35:26.702763403 +0200 +@@ -31,7 +31,7 @@ + AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \ + --no-split --number-sections --css-include=texinfo.css + +-dist_man_MANS = $(gdoc_MANS) asn1Parser.1 asn1Coding.1 asn1Decoding.1 ++dist_man_MANS = $(gdoc_MANS) + + HELP2MAN_OPTS = --info-page libtasn1 diff --git a/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb b/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb new file mode 100644 index 000000000..2d223861c --- /dev/null +++ b/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb @@ -0,0 +1,23 @@ +SUMMARY = "Library for ASN.1 and DER manipulation" +HOMEPAGE = "http://www.gnu.org/software/libtasn1/" + +LICENSE = "GPLv3+ & LGPLv2.1+" +LICENSE_${PN}-bin = "GPLv3+" +LICENSE_${PN} = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351" + +SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ + file://dont-depend-on-help2man.patch \ + file://0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch \ + " + +DEPENDS = "bison-native" + +SRC_URI[md5sum] = "ce2ba4d3088119b48e7531a703669c52" +SRC_URI[sha256sum] = "7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca" + +inherit autotools texinfo binconfig lib_package gtk-doc + +BBCLASSEXTEND = "native" -- cgit v1.2.3