From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../gnutls/gnutls/posix-shell.patch | 39 ------------- poky/meta/recipes-support/gnutls/gnutls_3.6.13.bb | 67 +++++++++++++++++++++ poky/meta/recipes-support/gnutls/gnutls_3.6.8.bb | 68 ---------------------- .../gnutls/libtasn1/fix-gtkdoc.patch | 38 ------------ .../gnutls/libtasn1/fix-ldflags.patch | 31 ---------- poky/meta/recipes-support/gnutls/libtasn1_4.14.bb | 24 -------- .../meta/recipes-support/gnutls/libtasn1_4.16.0.bb | 24 ++++++++ 7 files changed, 91 insertions(+), 200 deletions(-) delete mode 100644 poky/meta/recipes-support/gnutls/gnutls/posix-shell.patch create mode 100644 poky/meta/recipes-support/gnutls/gnutls_3.6.13.bb delete mode 100644 poky/meta/recipes-support/gnutls/gnutls_3.6.8.bb delete mode 100644 poky/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch delete mode 100644 poky/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch delete mode 100644 poky/meta/recipes-support/gnutls/libtasn1_4.14.bb create mode 100644 poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb (limited to 'poky/meta/recipes-support/gnutls') diff --git a/poky/meta/recipes-support/gnutls/gnutls/posix-shell.patch b/poky/meta/recipes-support/gnutls/gnutls/posix-shell.patch deleted file mode 100644 index 938e2d1e1..000000000 --- a/poky/meta/recipes-support/gnutls/gnutls/posix-shell.patch +++ /dev/null @@ -1,39 +0,0 @@ -Don't embed the path to the build-time POSIX shell as this will be -$TMPDIR/hosttools/bash, which is no good on the target. - -Instead default to /bin/sh but allow it to be set in the environment. - -This isn't really upstreamable but I filed a bug at -https://gitlab.com/gnutls/gnutls/issues/807 and hope a proper fix will be -integrated. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - -diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4 -index c6ad738..a62faca 100644 ---- a/src/libopts/m4/libopts.m4 -+++ b/src/libopts/m4/libopts.m4 -@@ -112,21 +112,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ - AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \ - strrchr strsignal fchmod fstat chmod]) - AC_PROG_SED -- [while : -- do -- POSIX_SHELL=`which bash` -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=`which dash` -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=/usr/xpg4/bin/sh -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=`/bin/sh -c ' -- exec 2>/dev/null -- if ! true ; then exit 1 ; fi -- echo /bin/sh'` -- test -x "$POSIX_SHELL" && break -- ]AC_MSG_ERROR([cannot locate a working POSIX shell])[ -- done] -+ POSIX_SHELL="${POSIX_SHELL:-/bin/sh}" - AC_DEFINE_UNQUOTED([POSIX_SHELL], ["${POSIX_SHELL}"], - [define to a working POSIX compliant shell]) - AC_SUBST([POSIX_SHELL]) diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.6.13.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.13.bb new file mode 100644 index 000000000..f56d42a61 --- /dev/null +++ b/poky/meta/recipes-support/gnutls/gnutls_3.6.13.bb @@ -0,0 +1,67 @@ +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=c678957b0c8e964aa6c70fd77641a71e \ + 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 = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ + file://arm_eabi.patch \ +" + +SRC_URI[md5sum] = "bb1fe696a11543433785b4fc70ca225f" +SRC_URI[sha256sum] = "32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38" + +inherit autotools texinfo 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,libidn2" +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} \ + --with-default-trust-store-file=${sysconfdir}/ssl/certs/ca-certificates.crt \ +" + +# Otherwise the tools try and use HOSTTOOLS_DIR/bash as a shell. +export POSIX_SHELL="${base_bindir}/sh" + +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.*" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.6.8.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.8.bb deleted file mode 100644 index c927063f0..000000000 --- a/poky/meta/recipes-support/gnutls/gnutls_3.6.8.bb +++ /dev/null @@ -1,68 +0,0 @@ -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=c678957b0c8e964aa6c70fd77641a71e \ - 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 = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ - file://arm_eabi.patch \ - file://posix-shell.patch \ -" - -SRC_URI[md5sum] = "9dcf0aa45d1a42e1b3ca5d39ec7c61a8" -SRC_URI[sha256sum] = "aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83" - -inherit autotools texinfo 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,libidn2" -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} \ - --with-default-trust-store-file=${sysconfdir}/ssl/certs/ca-certificates.crt \ -" - -# Otherwise the tools try and use HOSTTOOLS_DIR/bash as a shell. -export POSIX_SHELL="${base_bindir}/sh" - -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.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch b/poky/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted file mode 100644 index bfc9b9fca..000000000 --- a/poky/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49] -Signed-off-by: Ross Burton - -From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 9 Sep 2019 13:11:39 +0100 -Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter - -The object hierarchy section is empty because there are no GObjects in the -libtasn1 API. With gtk-doc 1.30 onwards if there are no objects then the object -hierarchy file won't exist, resulting in a failure when building the -documentation: - -| ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found - -Signed-off-by: Ross Burton ---- - doc/reference/libtasn1-docs.xml | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml -index accdb85..f88b888 100644 ---- a/doc/reference/libtasn1-docs.xml -+++ b/doc/reference/libtasn1-docs.xml -@@ -34,10 +34,6 @@ - - - -- -- Object Hierarchy -- -- - - API Index - --- -2.20.1 - diff --git a/poky/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch b/poky/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted file mode 100644 index f18f3c626..000000000 --- a/poky/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Tue, 23 Jul 2019 20:44:01 +0200 -Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Tim Rühsen -Upstream-Status: Backport -Signed-off-by: Anuj Mittal ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5bf3622..4459767 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \ - -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl $(CODE_COVERAGE_CPPFLAGS) - - LDADD = ../lib/libtasn1.la --LDFLAGS = $(CODE_COVERAGE_LDFLAGS) -+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) - - bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding - --- -2.21.0 - diff --git a/poky/meta/recipes-support/gnutls/libtasn1_4.14.bb b/poky/meta/recipes-support/gnutls/libtasn1_4.14.bb deleted file mode 100644 index ef2c1956a..000000000 --- a/poky/meta/recipes-support/gnutls/libtasn1_4.14.bb +++ /dev/null @@ -1,24 +0,0 @@ -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://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ - file://LICENSE;md5=75ac100ec923f959898182307970c360" - -SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ - file://dont-depend-on-help2man.patch \ - file://fix-ldflags.patch \ - file://fix-gtkdoc.patch \ - " - -DEPENDS = "bison-native" - -SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205" -SRC_URI[sha256sum] = "9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08" - -inherit autotools texinfo lib_package gtk-doc - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb b/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb new file mode 100644 index 000000000..8337b7024 --- /dev/null +++ b/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -0,0 +1,24 @@ +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://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE;md5=75ac100ec923f959898182307970c360" + +SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ + file://dont-depend-on-help2man.patch \ + " + +DEPENDS = "bison-native" + +SRC_URI[md5sum] = "531208de3729d42e2af0a32890f08736" +SRC_URI[sha256sum] = "0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d" + +inherit autotools texinfo lib_package gtk-doc + +CFLAGS_append_class-native = " -std=gnu99" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3