From 1d324d7d7a5776ba95f03a03142cff5772ca1a3e Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <frickler@offenerstapel.de>
Date: Tue, 21 Dec 2021 05:18:48 +0000
Subject: Revert "Workaround setuptools==60.0.0 breakages"

This reverts commit b69c58971895a6ab8a23bcdc4b7b56d01f26e2f5.

Reason for revert: The original commit was a hotfix to work around build failures, we should try to move back to a normal state again.

Change-Id: Iff79de9dabcd4bba795f3c44d3017baa5a860306
---
 docker/base/Dockerfile.j2 | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'docker')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 8733d82c1..26a6bd218 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -35,9 +35,6 @@ ENV KOLLA_BASE_DISTRO={{ base_distro }} \
     KOLLA_DISTRO_PYTHON_VERSION={{ distro_python_version }} \
     KOLLA_BASE_ARCH={{ base_arch }}
 
-{# NOTE(frickler): sledgehammer workaround until pkgs are updated to build with setuptools==60.0.0 properly #}
-ENV SETUPTOOLS_USE_DISTUTILS=stdlib
-
 
 #### Customize PS1 to be used with bash shell
 COPY kolla_bashrc /tmp/
-- 
cgit v1.2.3