On Tue, Nov 29, 2022 at 11:40 AM Petr Lautrbach <lautrbach@xxxxxxxxxx> wrote: > > Fixes: > /usr/lib/python3.11/site-packages/setuptools/command/install.py:34: SetuptoolsDeprecationWarning: setup.py install is deprecated. Use build and pip and other standards-based tools. > > Signed-off-by: Petr Lautrbach <lautrbach@xxxxxxxxxx> I made a mess of this. I merged the earlier patch by mistake, that has been reverted and this version merged. Acked-by: James Carter <jwcart2@xxxxxxxxx> and merged. Thanks, Jim > --- > README.md | 8 +++++++- > libselinux/src/Makefile | 2 +- > python/sepolicy/Makefile | 2 +- > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/README.md b/README.md > index 529b7e46c871..c272ce89fec5 100644 > --- a/README.md > +++ b/README.md > @@ -62,6 +62,9 @@ dnf install \ > # For Python and Ruby bindings > dnf install \ > python3-devel \ > + python3-pip \ > + python3-setuptools \ > + python3-wheel \ > ruby-devel \ > swig > ``` > @@ -92,6 +95,9 @@ apt-get install --no-install-recommends --no-install-suggests \ > # For Python and Ruby bindings > apt-get install --no-install-recommends --no-install-suggests \ > python3-dev \ > + python3-pip \ > + python3-setuptools \ > + python3-wheel \ > ruby-dev \ > swig > ``` > @@ -102,7 +108,7 @@ To build and install everything under a private directory, run: > > make DESTDIR=~/obj install install-rubywrap install-pywrap > > -On Debian `PYTHON_SETUP_ARGS=--install-layout=deb` needs to be set when installing the python wrappers in order to create the correct python directory structure. > +On Debian `PYTHON_SETUP_ARGS='--install-option "--install-layout=deb"'` needs to be set when installing the python wrappers in order to create the correct python directory structure. > > To run tests with the built libraries and programs, several paths (relative to `$DESTDIR`) need to be added to variables `$LD_LIBRARY_PATH`, `$PATH` and `$PYTHONPATH`. > This can be done using [./scripts/env_use_destdir](./scripts/env_use_destdir): > diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile > index dc2848322e4d..0f6396ababa4 100644 > --- a/libselinux/src/Makefile > +++ b/libselinux/src/Makefile > @@ -187,7 +187,7 @@ install: all > ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) > > install-pywrap: pywrap > - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) > + $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) . > install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py > ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) > > diff --git a/python/sepolicy/Makefile b/python/sepolicy/Makefile > index d983e409e5e6..57a2e55edbbf 100644 > --- a/python/sepolicy/Makefile > +++ b/python/sepolicy/Makefile > @@ -27,7 +27,7 @@ test: > @$(PYTHON) test_sepolicy.py -v > > install: > - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) > + $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) . > [ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) > install -m 755 sepolicy.py $(DESTDIR)$(BINDIR)/sepolicy > (cd $(DESTDIR)$(BINDIR); ln -sf sepolicy sepolgen) > -- > 2.38.1 >
