From 81b801b17efd6883189f4b31f75f1f3bca289d20 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 7 Apr 2016 11:07:55 +0300 Subject: [PATCH] buildsys: remove SSL_CERTIFICATES --- config/path | 2 -- packages/security/libressl/package.mk | 8 ++++---- packages/web/curl/package.mk | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/path b/config/path index f302c70fec..7d160d4e1d 100644 --- a/config/path +++ b/config/path @@ -199,8 +199,6 @@ XORG_PATH_RGB=/usr/lib/X11/rgb XORG_PATH_MODULES=/usr/lib/xorg/modules XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers -SSL_CERTIFICATES="/etc/ssl" - TOOLCHAIN_LANGUAGES=c [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++ diff --git a/packages/security/libressl/package.mk b/packages/security/libressl/package.mk index 28bddbd025..7395ede796 100644 --- a/packages/security/libressl/package.mk +++ b/packages/security/libressl/package.mk @@ -34,10 +34,10 @@ PKG_AUTORECONF="yes" post_makeinstall_target() { # create new cert: ./mkcerts.sh - mkdir -p $INSTALL/$SSL_CERTIFICATES - cp $PKG_DIR/cert/ca-bundle.crt $INSTALL/$SSL_CERTIFICATES/cacert.pem + mkdir -p $INSTALL/etc/ssl + cp $PKG_DIR/cert/ca-bundle.crt $INSTALL/etc/ssl/cacert.pem # backwards comatibility mkdir -p $INSTALL/etc/pki/tls - ln -sf $SSL_CERTIFICATES/cacert.pem $INSTALL/etc/pki/tls/cacert.pem - ln -sf $SSL_CERTIFICATES/cacert.pem $INSTALL/etc/ssl/cert.pem + ln -sf /etc/ssl/cacert.pem $INSTALL/etc/pki/tls/cacert.pem + ln -sf /etc/ssl/cacert.pem $INSTALL/etc/ssl/cert.pem } diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index 744a217830..27f5ecc479 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -87,7 +87,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_rtmp_RTMP_Init=yes \ --with-ssl \ --without-polarssl \ --without-nss \ - --with-ca-bundle=$SSL_CERTIFICATES/cacert.pem \ + --with-ca-bundle=/etc/ssl/cacert.pem \ --without-ca-path \ --without-libpsl \ --without-libmetalink \