saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't hard-code version. Use PY_VERSION and PY_DOT_VERSION

Browse source
This commit is contained in:
Twangboy 2022-05-20 16:00:38 -06:00 • committed by Gareth J. Greenaway
parent d8c6732a4f
commit e36f751178
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/osx/build_env.sh
View file

@ -58,8 +58,8 @@ MACOSX_DEPLOYMENT_TARGET=10.15
export MACOSX_DEPLOYMENT_TARGET
# Versions we're going to install
PY_VERSION=3.8
PY_DOT_VERSION=3.8.13
PY_VERSION=3.9
PY_DOT_VERSION=3.9.12
ZMQ_VERSION=4.3.4
LIBSODIUM_VERSION=1.0.18

10
pkg/osx/package.sh
View file

@ -93,6 +93,8 @@ echo "**** Setting Variables"
SRCDIR=`git rev-parse --show-toplevel`
PKGRESOURCES=$SRCDIR/pkg/osx
PY_VERSION=3.9
PY_DOT_VERSION=3.9.12
################################################################################
# Make sure this is the Salt Repository
@ -144,10 +146,10 @@ cp $PKGRESOURCES/scripts/com.saltstack.salt.api.plist $PKGDIR/Library/LaunchDaem
echo "**** Trimming Unneeded Files"
rm -rdf $PKGDIR/opt/salt/.pyenv/lib/pkgconfig
rm -rdf $PKGDIR/opt/salt/.pyenv/versions/3.7.12/lib/engines*
rm -rdf $PKGDIR/opt/salt/.pyenv/versions/3.7.12/lib/python3.7/test
rm -rdf $PKGDIR/opt/salt/.pyenv/versions/3.7.12/lib/python3.7/site-packages/Cryptodome/SelfTest
rm -rdf $PKGDIR/opt/salt/.pyenv/versions/3.7.12/lib/python3.7/site-packages/libcloud/test
rm -rdf $PKGDIR/opt/salt/.pyenv/versions/$PY_DOT_VERSION/lib/engines*
rm -rdf $PKGDIR/opt/salt/.pyenv/versions/$PY_DOT_VERSION/lib/$PY_VERSION/test
rm -rdf $PKGDIR/opt/salt/.pyenv/versions/$PY_DOT_VERSION/lib/$PY_VERSION/site-packages/Cryptodome/SelfTest
rm -rdf $PKGDIR/opt/salt/.pyenv/versions/$PY_DOT_VERSION/lib/$PY_VERSION/site-packages/libcloud/test
echo "**** Removing pkgconfig directories"
find $PKGDIR/opt/salt -name 'pkgconfig' -type d -prune -exec rm -rf {} \;

2
pkg/osx/pkg-scripts/postinstall
View file

@ -22,7 +22,7 @@
# Get Minor Version
OSX_VERSION=$(sw_vers | grep ProductVersion | cut -f 2 -d: | tr -d '[:space:]')
MINOR=$(echo ${OSX_VERSION} | cut -f 2 -d.)
PY_DOT_VERSION="3.7.12"
PY_DOT_VERSION=3.9.12
# Path Variables
INSTALL_DIR="/opt/salt"
BIN_DIR="$INSTALL_DIR/bin"

8
pkg/osx/sign_binaries.sh
View file

@ -67,14 +67,16 @@ quit_on_error() {
################################################################################
echo "**** Setting Variables"
INSTALL_DIR=/opt/salt
PY_VERSION=3.9
PY_DOT_VERSION=3.9.12
################################################################################
# Add rpath to the Python binaries before signing
################################################################################
echo "**** Setting rpath in binaries"
install_name_tool $INSTALL_DIR/bin/python3.7m \
-add_rpath $INSTALL_DIR/.pyenv/versions/3.7.12/lib \
-add_rpath $INSTALL_DIR/.pyenv/versions/3.7.12/openssl/lib || echo "already present"
install_name_tool $INSTALL_DIR/bin/python${PY_VERSION}m \
-add_rpath $INSTALL_DIR/.pyenv/versions/$PY_DOT_VERSION/lib \
-add_rpath $INSTALL_DIR/.pyenv/versions/$PY_DOT_VERSION/openssl/lib || echo "already present"
################################################################################
# Sign python binaries in `bin` and `lib`