Commit 3ba1893b authored by intrigeri's avatar intrigeri
Browse files

Fix build failure by breaking cyclic dependency (refs: #14595)

This reverts commit e0b24a21
and ensures we remove python3-setuptools later on.

Otherwise there's a cyclic dependency situation: to install tailslib in
config/chroot_local-hooks/00-install-tailslib we need to install
python3-setuptools, which triggers the APT hook for ASP, which depends on
tailslib to be available already.
parent 6b316748
......@@ -5,11 +5,6 @@ set -u
echo "Installing the tailslib python library"
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed python3-setuptools
(
cd /tmp/pythonlib
python3 setup.py clean
......
......@@ -22,6 +22,7 @@ apt-get --yes purge \
linux-libc-dev \
make \
po-debconf \
python3-setuptools \
rsyslog \
libdvdcss-dev
......
......@@ -436,3 +436,6 @@ libclass-xsaccessor-perl
libmoox-options-perl
libtypes-path-tiny-perl
libuuid-tiny-perl
# To install the Tails Python library at ISO build time
python3-setuptools
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment