valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #49539 from twangboy/fix_osx_build_2

Browse Source 
Fix issues with build script on OSX
This commit is contained in:
Nicole Thomas 2018-09-06 11:49:35 -04:00 committed by GitHub
commit 397296f088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/osx/build_env.sh
View File

@ -199,8 +199,8 @@ sudo -H $MAKE install
############################################################################ ############################################################################
echo -n -e "\033]0;Build_Env: OpenSSL\007" echo -n -e "\033]0;Build_Env: OpenSSL\007"
PKGURL="http://openssl.org/source/openssl-1.0.2l.tar.gz" PKGURL="http://openssl.org/source/openssl-1.0.2p.tar.gz"
PKGDIR="openssl-1.0.2l" PKGDIR="openssl-1.0.2p"
download $PKGURL download $PKGURL
@ -241,7 +241,7 @@ sudo -H $MAKE install
############################################################################ ############################################################################
# upgrade pip # upgrade pip
############################################################################ ############################################################################
sudo -H $PIP install --upgrade pip sudo -H $PIP install --upgrade pip --trusted-host pypi.org --trusted-host files.pythonhosted.org
############################################################################ ############################################################################
# Download and install salt python dependencies # Download and install salt python dependencies

2
pkg/osx/req.txt
View File

@ -25,7 +25,7 @@ PyYAML==3.12
pyzmq==16.0.2 pyzmq==16.0.2
requests==2.18.1 requests==2.18.1
singledispatch==3.4.0.3 singledispatch==3.4.0.3
six==1.10.0 six==1.11.0
smmap==0.9.0 smmap==0.9.0
timelib==0.2.4 timelib==0.2.4
tornado==4.5.1 tornado==4.5.1

1
pkg/osx/shasums/openssl-1.0.2l.tar.gz.sha512
View File

@ -1 +0,0 @@
047d964508ad6025c79caabd8965efd2416dc026a56183d0ef4de7a0a6769ce8e0b4608a3f8393d326f6d03b26a2b067e6e0c750f35b20be190e595e8290c0e3 ./openssl-1.0.2l.tar.gz

1
pkg/osx/shasums/openssl-1.0.2p.tar.gz.sha512 Normal file
View File

@ -0,0 +1 @@
958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 ./openssl-1.0.2p.tar.gz