diff --git a/config/path b/config/path index 3d5e9b37ff..3f40fa52e8 100644 --- a/config/path +++ b/config/path @@ -29,6 +29,7 @@ TOOLCHAIN=$BUILD/toolchain SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot LIB_PREFIX=$SYSROOT_PREFIX/usr TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME- +SSL_CERTIFICATES="etc/pki/tls" FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH diff --git a/packages/security/ca-certification/install b/packages/security/ca-certification/install index b2c0025f64..184eca2979 100755 --- a/packages/security/ca-certification/install +++ b/packages/security/ca-certification/install @@ -22,6 +22,5 @@ . config/options $1 -mkdir -p $INSTALL/etc/pki/tls - cp $PKG_DIR/script/ca-bundle.crt $INSTALL/etc/pki/tls - cp $PKG_DIR/script/ca-bundle.crt $INSTALL/etc/pki/tls/cacert.pem +mkdir -p $INSTALL/$SSL_CERTIFICATES + cp $PKG_DIR/script/ca-bundle.crt $INSTALL/$SSL_CERTIFICATES/cacert.pem diff --git a/packages/security/openssl/build b/packages/security/openssl/build index f93a7666f6..9d3af36a1a 100755 --- a/packages/security/openssl/build +++ b/packages/security/openssl/build @@ -45,7 +45,7 @@ esac cd $PKG_BUILD ./Configure --prefix=/usr \ --libdir=lib \ - --openssldir=/etc/pki/tls \ + --openssldir="/$SSL_CERTIFICATES" \ --install_prefix="$SYSROOT_PREFIX" \ shared \ threads \ diff --git a/packages/security/openssl/install b/packages/security/openssl/install index b7c6bb703d..7b1e5c6eed 100755 --- a/packages/security/openssl/install +++ b/packages/security/openssl/install @@ -22,8 +22,8 @@ . config/options $1 -mkdir -p $INSTALL/etc/pki/tls - cp -P $PKG_BUILD/apps/openssl.cnf $INSTALL/etc/pki/tls +mkdir -p $INSTALL/$SSL_CERTIFICATES + cp -P $PKG_BUILD/apps/openssl.cnf $INSTALL/$SSL_CERTIFICATES mkdir -p $INSTALL/usr/bin cp -P $PKG_BUILD/apps/openssl $INSTALL/usr/bin diff --git a/packages/web/curl/build b/packages/web/curl/build index 5e256923af..f919ae6e67 100755 --- a/packages/web/curl/build +++ b/packages/web/curl/build @@ -77,7 +77,7 @@ ac_cv_header_librtmp_rtmp_h=yes \ --without-gnutls \ --without-polarssl \ --without-nss \ - --with-ca-bundle="/etc/pki/tls/cacert.pem" \ + --with-ca-bundle="/$SSL_CERTIFICATES/cacert.pem" \ --without-ca-path \ --without-libssh2 \ --with-librtmp="$SYSROOT_PREFIX/usr" \