diff --git a/lib/functions/host/prepare-host.sh b/lib/functions/host/prepare-host.sh index ed37856f72..b2753462bc 100644 --- a/lib/functions/host/prepare-host.sh +++ b/lib/functions/host/prepare-host.sh @@ -290,7 +290,8 @@ function adaptative_prepare_host_dependencies() { host_deps_add_extra_python # See python-tools.sh::host_deps_add_extra_python() ### Python3 -- required for Armbian's Python tooling, and also for more recent u-boot builds. Needs 3.9+; ffi-dev is needed for some Python packages when the wheel is not prebuilt - host_dependencies+=("python3-dev" "python3-setuptools" "python3-pip" "python3-pyelftools" "libffi-dev") + ### 'python3-setuptools' and 'python3-pyelftools' moved to requirements.txt to make sure build hosts use the same/latest versions of these tools. + host_dependencies+=("python3-dev" "python3-pip" "libffi-dev") # Needed for some u-boot's, lest "tools/mkeficapsule.c:21:10: fatal error: gnutls/gnutls.h" host_dependencies+=("libgnutls28-dev") diff --git a/requirements.txt b/requirements.txt index 2d21cf6a3b..83dcdb344e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,8 @@ # Always use a fixed version, this is important for correct hashing. # Dependabot will keep these versions up to date. +setuptools == 70.1.1 # for building Python packages +pyelftools == 0.31 # for building U-Boot unidiff == 0.7.5 # for parsing unified diff GitPython == 3.1.43 # for manipulating git repos unidecode == 1.3.8 # for converting strings to ascii