buildsys: remove SSL_CERTIFICATES

This commit is contained in:
Stefan Saraev 2016-04-07 11:07:55 +03:00 committed by Lukas Rusak
parent 0e358638e4
commit 81b801b17e
3 changed files with 5 additions and 7 deletions

View File

@ -199,8 +199,6 @@ XORG_PATH_RGB=/usr/lib/X11/rgb
XORG_PATH_MODULES=/usr/lib/xorg/modules XORG_PATH_MODULES=/usr/lib/xorg/modules
XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
SSL_CERTIFICATES="/etc/ssl"
TOOLCHAIN_LANGUAGES=c TOOLCHAIN_LANGUAGES=c
[ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++ [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++

View File

@ -34,10 +34,10 @@ PKG_AUTORECONF="yes"
post_makeinstall_target() { post_makeinstall_target() {
# create new cert: ./mkcerts.sh # create new cert: ./mkcerts.sh
mkdir -p $INSTALL/$SSL_CERTIFICATES mkdir -p $INSTALL/etc/ssl
cp $PKG_DIR/cert/ca-bundle.crt $INSTALL/$SSL_CERTIFICATES/cacert.pem cp $PKG_DIR/cert/ca-bundle.crt $INSTALL/etc/ssl/cacert.pem
# backwards comatibility # backwards comatibility
mkdir -p $INSTALL/etc/pki/tls mkdir -p $INSTALL/etc/pki/tls
ln -sf $SSL_CERTIFICATES/cacert.pem $INSTALL/etc/pki/tls/cacert.pem ln -sf /etc/ssl/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/ssl/cert.pem
} }

View File

@ -87,7 +87,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_rtmp_RTMP_Init=yes \
--with-ssl \ --with-ssl \
--without-polarssl \ --without-polarssl \
--without-nss \ --without-nss \
--with-ca-bundle=$SSL_CERTIFICATES/cacert.pem \ --with-ca-bundle=/etc/ssl/cacert.pem \
--without-ca-path \ --without-ca-path \
--without-libpsl \ --without-libpsl \
--without-libmetalink \ --without-libmetalink \