diff --git a/conf/layer.conf b/conf/layer.conf index 34844f3..708b948 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -10,4 +10,5 @@ BBFILE_COLLECTION += "wolfssl" BBFILE_PATTERN_wolfssl := "^${LAYERDIR}/" BBFILE_PRIORITY_wolfssl = "5" -IMAGE_INSTALL_append = "wolfssl" +# Yocto manual recommends a space before this list to prevent conflicts +IMAGE_INSTALL_append = " wolfssl" diff --git a/recipes-wolfssl/wolfssh/files/0001-fix-have-wolfssl-m4-rule.patch b/recipes-wolfssl/wolfssh/files/0001-fix-have-wolfssl-m4-rule.patch deleted file mode 100644 index 28d83d2..0000000 --- a/recipes-wolfssl/wolfssh/files/0001-fix-have-wolfssl-m4-rule.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: wolfssh-1.3.0/m4/have_wolfssl.m4 -=================================================================== ---- wolfssh-1.3.0.orig/m4/have_wolfssl.m4 -+++ wolfssh-1.3.0/m4/have_wolfssl.m4 -@@ -7,7 +7,7 @@ - AC_DEFUN([_TAO_SEARCH_LIBWOLFSSL],[ - AC_REQUIRE([AC_LIB_PREFIX]) - -- LDFLAGS="$LDFLAGS -L/usr/local/lib" -+ LDFLAGS="$LDFLAGS" - LIBS="$LIBS -lwolfssl" - - AC_LIB_HAVE_LINKFLAGS(wolfssl,, diff --git a/recipes-wolfssl/wolfssh/wolfssh_1.4.2.bb b/recipes-wolfssl/wolfssh/wolfssh_1.4.3.bb similarity index 69% rename from recipes-wolfssl/wolfssh/wolfssh_1.4.2.bb rename to recipes-wolfssl/wolfssh/wolfssh_1.4.3.bb index 98abff9..4b31e0d 100644 --- a/recipes-wolfssl/wolfssh/wolfssh_1.4.2.bb +++ b/recipes-wolfssl/wolfssh/wolfssh_1.4.3.bb @@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=2c2d0ee3db6ceba278dd43212ed03733" DEPENDS += "wolfssl" -SRC_URI[md5sum] = "beb32aabc3cbe1efdd90b72fab2ed114" -SRC_URI[sha256sum] = "62bdec345828e3f3b718c1e70208ba72c9e8e39769357a0a13e67ceee40845c3" -SRC_URI = "https://www.wolfssl.com/wolfssh-${PV}.zip \ - file://0001-fix-have-wolfssl-m4-rule.patch" +SRC_URI[md5sum] = "e61610187eb20d45c9e31f5c5a8f9c91" +SRC_URI[sha256sum] = "b98ce6cc3f1a9fb12c8e9cbc29ba0c40e740272cfce9e138c9a73b227f88bc70" +SRC_URI = "https://www.wolfssl.com/wolfssh-${PV}.zip" inherit autotools