Skip to content

Follow-ups to OpenSSL 3.6.3 bump: CPython #391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jhanca-robotecai wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Follow-ups to OpenSSL 3.6.3 bump: CPython #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a46f34e
Remove obsolete dependencies in Qt build
jhanca-robotecai Jul 22, 2026
6bd771a
Rebuild Python's bundled OpenSSL dependency to 3.6.3 on Linux
jhanca-robotecai Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions package-system/Qt/build-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,11 @@

# TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script

# Arg 1: The tiff package name
TIFF_FOLDER_NAME=$1

# Arg 2: The zlib package name
ZLIB_FOLDER_NAME=$2

# Arg 3: The openssl package name
OPENSSL_FOLDER_NAME=$3

# Determine the host architecture
CURRENT_HOST_ARCH=$(uname -m)

# Use the host architecture if not supplied
TARGET_ARCH=${4:-$(uname -m)}
TARGET_ARCH=${1:-$(uname -m)}

# If the host and target architecture does not match, we stop
if [ "${CURRENT_HOST_ARCH}" != ${TARGET_ARCH} ]
Expand Down
8 changes: 0 additions & 8 deletions package-system/Qt/build_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,11 @@
"patch_file": "recursion-check.patch",
"package_version": "6.10.2-rev8",
"depends_on_packages": [
["OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", ""],
["tiff-4.2.0.15-rev3-linux", "2377f48b2ebc2d1628d9f65186c881544c92891312abe478a20d10b85877409a", ""],
["zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", ""]
],
"custom_build_cmd": [
"./build-linux.sh",
"tiff-4.2.0.15-rev3-linux",
"zlib-1.2.11-rev5-linux",
"OpenSSL-1.1.1t-rev1-linux",
"x86_64"
],
"custom_install_cmd": [
Expand All @@ -78,15 +74,11 @@
"package_version": "5.15.2-rev10",
"patch_file": "qt-linux.patch",
"depends_on_packages": [
["OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", ""],
["tiff-4.2.0.15-rev3-linux-aarch64", "429461014b21a530dcad597c2d91072ae39d937a04b7bbbf5c34491c41767f7f", ""],
["zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", ""]
],
"custom_build_cmd": [
"./build-linux.sh",
"tiff-4.2.0.15-rev3-linux-aarch64",
"zlib-1.2.11-rev5-linux-aarch64",
"OpenSSL-1.1.1t-rev1-linux-aarch64",
"aarch64"
],
"custom_install_cmd": [
Expand Down
6 changes: 3 additions & 3 deletions package-system/python/build_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"git_url":"https://github.com/python/cpython.git",
"git_tag":"v3.10.13",
"package_name":"python",
"package_version":"3.10.13-rev2",
"package_version":"3.10.13-rev3",
"package_url":"https://python.org",
"package_license":"PSF-2.0",
"package_license_file":"LICENSE",
Expand All @@ -12,7 +12,7 @@
"Linux":{
"Linux":{
"depends_on_packages": [
[ "OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", "" ],
[ "OpenSSL-3.6.3-rev1-linux", "24fbf89977f7976ad0e5893877732fe069a5afcb9d5a2e7c75156b248475da5b", "" ],
[ "SQLite-3.37.2-rev1-linux", "bee80d6c6db3e312c1f4f089c90894436ea9c9b74d67256d8c1fb00d4d81fe46", "" ]
],
"custom_build_cmd": [
Expand All @@ -31,7 +31,7 @@
},
"Linux-aarch64":{
"depends_on_packages": [
[ "OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", "" ],
[ "OpenSSL-3.6.3-rev1-linux-aarch64", "c6e360cd1aee6476849a72d96370c51a895ab53155e9fe7e456a0e77a62a6b2a", "" ],
[ "SQLite-3.37.2-rev1-linux-aarch64", "5cc1fd9294af72514eba60509414e58f1a268996940be31d0ab6919383f05118", "" ]
],
"custom_build_cmd": [
Expand Down
6 changes: 3 additions & 3 deletions package-system/python/docker_build_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ cp -r $WORKSPACE/temp/src ${SRC_PATH}
# The dependent 'depends_on_packages' paths are architecture dependent
if [ "$(uname -m)" = "x86_64" ]
then
O3DE_OPENSSL_PACKAGE=OpenSSL-1.1.1t-rev1-linux
O3DE_OPENSSL_PACKAGE=OpenSSL-3.6.3-rev1-linux
O3DE_SQLITE_PACKAGE=SQLite-3.37.2-rev1-linux
else
O3DE_OPENSSL_PACKAGE=OpenSSL-1.1.1t-rev1-linux-aarch64
O3DE_OPENSSL_PACKAGE=OpenSSL-3.6.3-rev1-linux-aarch64
O3DE_SQLITE_PACKAGE=SQLite-3.37.2-rev1-linux-aarch64
fi

Expand Down Expand Up @@ -140,7 +140,7 @@ echo "Preparing additional python files"
cp ${SRC_PATH}/LICENSE ${BUILD_FOLDER}/python/LICENSE

# Also copy the openssl license since its linked against the dependent O3DE OpenSSL static package
cp ${OPENSSL_BASE}/LICENSE ${BUILD_FOLDER}/python/LICENSE.OPENSSL
cp ${OPENSSL_BASE}/LICENSE.txt ${BUILD_FOLDER}/python/LICENSE.OPENSSL

# Create a symlink from python -> python3
pushd ${BUILD_FOLDER}/python/bin
Expand Down
4 changes: 2 additions & 2 deletions package_build_list_host_linux-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"png-1.6.37-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux-aarch64 --clean",
"poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri/build_package_image.py --platform-name linux-aarch64",
"pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux-aarch64 --clean",
"python-3.10.13-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean",
"python-3.10.13-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean",
"qt-5.15.2-rev10-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean",
"sdformat-13.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux-aarch64 --clean",
"SPIRVCross-1.3.275.0-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux-aarch64 --clean",
Expand Down Expand Up @@ -73,7 +73,7 @@
"png-1.6.37-rev2-linux-aarch64": "package-system/libpng/temp/png-linux-aarch64",
"poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri-linux-aarch64",
"pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "package-system/pyside2/temp/pyside2-linux-aarch64",
"python-3.10.13-rev2-linux-aarch64": "package-system/python/temp/python-linux-aarch64",
"python-3.10.13-rev3-linux-aarch64": "package-system/python/temp/python-linux-aarch64",
"qt-5.15.2-rev10-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64",
"sdformat-13.5.0-rev2-linux-aarch64": "package-system/sdformat/temp/sdformat-linux-aarch64",
"SPIRVCross-1.3.275.0-rev1-linux-aarch64": "package-system/SPIRVCross/temp/SPIRVCross-linux-aarch64",
Expand Down
8 changes: 4 additions & 4 deletions package_build_list_host_linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"DirectXShaderCompilerDxc-1.8.2505.1-o3de-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean",
"azslc-1.8.22-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux --package-root ../../package-system/azslc/temp --clean",
"tiff-4.2.0.15-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux --package-root ../../package-system --clean",
"python-3.10.13-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux --clean",
"python-3.10.13-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean",
"python-3.10.13-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux --clean",
"python-3.10.13-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean",
"mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
"qt-6.10.2-rev8-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean",
"zlib-1.2.11-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
Expand Down Expand Up @@ -87,8 +87,8 @@
"DirectXShaderCompilerDxc-1.8.2505.1-o3de-rev3-linux": "package-system/DirectXShaderCompilerDxc-linux",
"azslc-1.8.22-rev1-linux": "package-system/azslc/temp/azslc-linux",
"tiff-4.2.0.15-rev3-linux": "package-system/tiff-linux",
"python-3.10.13-rev2-linux": "package-system/python/temp/python-linux",
"python-3.10.13-rev2-linux-aarch64": "package-system/python/temp/python-linux-aarch64",
"python-3.10.13-rev3-linux": "package-system/python/temp/python-linux",
"python-3.10.13-rev3-linux-aarch64": "package-system/python/temp/python-linux-aarch64",
"PhysX-4.1.2.29882248-rev8-linux": "package-system/PhysX-linux",
"PhysX-5.1.1-rev4-linux": "package-system/PhysX5/temp/PhysX5-linux",
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth-linux",
Expand Down
Loading