From dc73a3132b3a384432433ccc1623452bad7049e4 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Sat, 29 Oct 2022 13:41:14 -0700 Subject: [PATCH] build-install-dumb-init: fix for setuptools Apply the equivalent of a fix from upstream to allow setuptools > 59.6.0 to work https://github.com/Yelp/dumb-init/issues/273 https://github.com/Yelp/dumb-init/pull/274 Signed-off-by: Tim Orling --- build-install-dumb-init.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-install-dumb-init.sh b/build-install-dumb-init.sh index a555eb4..261f5f9 100644 --- a/build-install-dumb-init.sh +++ b/build-install-dumb-init.sh @@ -36,6 +36,8 @@ echo "3eda470d8a4a89123f4516d26877a727c0945006c8830b7e3bad717a5f6efc4e v1.2.5.t sha256sum -c sha256sums || exit 1 tar xf v1.2.5.tar.gz || exit 1 +# https://github.com/Yelp/dumb-init/issues/273 +sed -i '128 i \ \ \ \ packages=[],' dumb-init*/setup.py || exit 1 # Replace the versions of python used for testing dumb-init. Since it is # testing c code, and not python it shouldn't matter. Also remove the @@ -56,7 +58,7 @@ pip3 install virtualenv || exit 1 virtualenv $builddir/venv || exit 1 . $builddir/venv/bin/activate || exit 1 -pip3 install setuptools==59.6.0 tox || exit 1 +pip3 install setuptools tox || exit 1 ) . $builddir/venv/bin/activate || exit 1