mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-06 06:29:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Build a Python 3.9.13 framework instead of 3.10.x to avoid issue #1136

Browse Source
This commit is contained in:
Greg Neagle
2022-05-20 09:00:56 -07:00
parent 5ee0f5928a
commit 60cfd69bb7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/tools/build_python_framework.sh
View File

@@ -4,7 +4,7 @@
TOOLSDIR=$(dirname "$0")
REQUIREMENTS="${TOOLSDIR}/py3_requirements.txt"
PYTHON_VERSION=3.10.4
PYTHON_VERSION=3.9.13
PYTHON_PRERELEASE_VERSION=
PYTHON_BASEURL="https://www.python.org/ftp/python/%s/python-%s${PYTHON_PRERELEASE_VERSION}-macos%s.pkg"
MACOS_VERSION=11
@@ -71,9 +71,9 @@ if [ "$LIB_COUNT" != "$UNIVERSAL_COUNT" ] ; then
fi
# test some more files in the framework
MORE_FILES="Python.framework/Versions/3.10/Resources/Python.app/Contents/MacOS/Python
MORE_FILES="Python.framework/Versions/3.9/Resources/Python.app/Contents/MacOS/Python
Python.framework/Versions/Current/Python
Python.framework/Versions/Current/bin/python3.10"
Python.framework/Versions/Current/bin/python3.9"
for TESTFILE in $MORE_FILES ; do
ARCH_TEST=$(file "${MUNKIROOT}/$TESTFILE" | grep "2 architectures")

2
code/tools/pkgresources/python_cleanup_scripts/cleanup.sh
View File

@@ -8,7 +8,7 @@ if [ -f "/usr/local/munki/python" ]; then
fi
# sometimes old versions are left behind in the framework. remove them.
for OLDVERS in 3.7 3.8 3.9 ; do
for OLDVERS in 3.7 3.8 ; do
if [ -d "/usr/local/munki/Python.framework/Versions/${OLDVERS}" ]; then
/bin/rm -r "/usr/local/munki/Python.framework/Versions/${OLDVERS}"
fi