From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- ...0001-fix-no-rule-to-make-cyassl-options.h.patch | 27 ---------------------- .../recipes-connectivity/wolfssl/wolfssl_3.14.4.bb | 24 ------------------- .../recipes-connectivity/wolfssl/wolfssl_3.15.7.bb | 21 +++++++++++++++++ 3 files changed, 21 insertions(+), 51 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.14.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.15.7.bb (limited to 'meta-openembedded/meta-networking/recipes-connectivity/wolfssl') diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch deleted file mode 100644 index f304d933d..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fb490136cf8f2456cfe13b0b4f796e6c155e75dc Mon Sep 17 00:00:00 2001 -From: Dengke Du -Date: Wed, 30 Aug 2017 03:02:32 -0400 -Subject: [PATCH] fix no rule to make cyassl/options.h - -Upstream-Status: Pending - -Signed-off-by: Dengke Du ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 395d75d..d4a3880 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3684,6 +3684,7 @@ AC_CONFIG_FILES([wolfssl/options.h]) - #fi - AC_CONFIG_FILES([support/wolfssl.pc]) - AC_CONFIG_FILES([rpm/spec]) -+AC_CONFIG_FILES([cyassl/options.h]) - - AX_CREATE_GENERIC_CONFIG - AX_AM_JOBSERVER([yes]) --- -2.8.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.14.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.14.4.bb deleted file mode 100644 index dc9094d8b..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.14.4.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "wolfSSL Lightweight, Embedded SSL Library" -DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written in C and \ - optimized for embedded and RTOS environments. It can be \ - Up to 20 times smaller than OpenSSL while still supporting \ - a full TLS 1.2 client and server." -HOMEPAGE = "http://www.wolfssl.com/yaSSL/Products-wolfssl.html" -BUGTRACKER = "http://github.com/wolfssl/wolfssl/issues" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PROVIDES += "cyassl" -RPROVIDES_${PN} = "cyassl" - -S = "${WORKDIR}/git" -SRCREV = "1196a3b64d9fabffc8273b87f6f69ac0e75d2eb7" -SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https; \ - file://0001-fix-no-rule-to-make-cyassl-options.h.patch \ - " - -inherit autotools - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.15.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.15.7.bb new file mode 100644 index 000000000..0a0a6075d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.15.7.bb @@ -0,0 +1,21 @@ +SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library" +DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ + in C and optimized for embedded and RTOS environments. It can \ + be up to 20 times smaller than OpenSSL while still supporting \ + a full TLS client and server, up to TLS 1.3" +HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" +BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PROVIDES += "cyassl" +RPROVIDES_${PN} = "cyassl" + +SRC_URI = "https://www.wolfssl.com/wolfssl-${PV}.zip" +SRC_URI[md5sum] = "6ec08c09e3f51cccbb1686b4fd45f92f" +SRC_URI[sha256sum] = "4cc318c49580d3b9c361fe258fac6106624aa744f1d34e03977b587766a753ee" + +inherit autotools + +BBCLASSEXTEND += "native nativesdk" -- cgit v1.2.3