Merge pull request #158 from padelsbach/wp-symlinks-and-envvars

Wolfprov: Ensure libwolfprov.so is installed

recipes-examples/wolfprovider/wolfproviderenv/files/wolfproviderenv.sh

@@ -7,12 +7,6 @@
 REPLACE_DEFAULT_MODE=0
 WOLFSSL_FIPS_MODE=0
 
-# Setup for libwolfprov.so (needed before runtime detection)
-mkdir -p /usr/lib/ssl-3/modules
-if [ ! -L /usr/lib/ssl-3/modules/libwolfprov.so ]; then
-    ln -s /usr/lib/libwolfprov.so.0.0.0 /usr/lib/ssl-3/modules/libwolfprov.so
-fi
-
 # Environment variables (needed before runtime detection)
 export OPENSSL_MODULES=/usr/lib/ssl-3/modules
 export LD_LIBRARY_PATH=/usr/lib:/lib:$LD_LIBRARY_PATH

recipes-examples/wolfprovider/wolfprovidertest/files/wolfprovidertest.sh

@@ -16,10 +16,9 @@ echo "=========================================="
 echo "Running wolfProvider Unit Test"
 echo "=========================================="
 if [ -f /usr/bin/unit.test ]; then
-    # Create .libs symlink structure in /tmp so the test can find the provider
+    # Use a temp directory for the tests because they expect .libs to be present
     mkdir -p /tmp/.libs
-    ln -sf /usr/lib/libwolfprov.so.0.0.0 /tmp/.libs/libwolfprov.so 2>/dev/null || true
-    
+
     # Verify certificates are installed (CERTS_DIR is compiled to point here)
     echo "Verifying test certificates..."
     if [ -d /usr/share/wolfprovider-test/certs ]; then

recipes-wolfssl/wolfprovider/wolfprovider_1.1.0.bb

@@ -36,6 +36,11 @@ install_provider_module() {
         exit 1
     fi
 
+    # Create unversioned symlink in libdir (same dir as versioned .so)
+    if [ ! -e ${D}${libdir}/libwolfprov.so ]; then
+        ln -sf ${libdir}/libwolfprov.so.0.0.0 ${D}${libdir}/libwolfprov.so
+    fi
+
     # Create the OpenSSL module directory symlink
     install -d ${D}${libdir}/ssl-3/modules
     if [ ! -e ${D}${libdir}/ssl-3/modules/libwolfprov.so ]; then
@@ -64,4 +69,3 @@ EXTRA_OECONF += " --with-openssl=${STAGING_EXECPREFIXDIR}"
 
 # Keep unversioned .so in the runtime package
 FILES_SOLIBSDEV = ""
-