From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] python3: use PYTHON3_SITEPACKAGES variable
Date: Mon, 17 Aug 2020 08:18:20 +0200 [thread overview]
Message-ID: <E1k7YTM-0008AM-IT@dude02.hi.pengutronix.de> (raw)
In-Reply-To: <20200805105608.32371-1-p.zabel@pengutronix.de>
Thanks, applied as 89ca1131647c3b20ea5a172e65eba0c29c003a5a.
Michael
[sent from post-receive hook]
On Mon, 17 Aug 2020 08:18:20 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> python3.make helpfully defines the PYTHON3_SITEPACKAGES variable.
> Use it in all places that manually construct the site-packages
> directory.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20200805105608.32371-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/flup6.make b/rules/flup6.make
> index 062db8d8b3cb..faea5d716985 100644
> --- a/rules/flup6.make
> +++ b/rules/flup6.make
> @@ -48,7 +48,7 @@ $(STATEDIR)/flup6.targetinstall:
> @$(call install_copy, flup6, 0, 0, 0755, $(PYTHON_SITEPACKAGES)/flup6/server)
>
> @$(call install_glob, flup6, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/flup,, *.py)
> + $(PYTHON3_SITEPACKAGES)/flup,, *.py)
>
> @$(call install_finish, flup6)
>
> diff --git a/rules/gst-python1.make b/rules/gst-python1.make
> index 988dacffc56b..f5891266e3fc 100644
> --- a/rules/gst-python1.make
> +++ b/rules/gst-python1.make
> @@ -61,7 +61,7 @@ $(STATEDIR)/gst-python1.targetinstall:
> @$(call install_fixup, gst-python1,DESCRIPTION,missing)
>
> @$(call install_glob, gst-python1, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/gi,, *.py *.la)
> + $(PYTHON3_SITEPACKAGES)/gi,, *.py *.la)
>
> @$(call install_lib, gst-python1, 0, 0, 0644, gstreamer-1.0/libgstpython*)
>
> diff --git a/rules/python3-aiofiles.make b/rules/python3-aiofiles.make
> index 9d6727bf4bb9..8974572b5e13 100644
> --- a/rules/python3-aiofiles.make
> +++ b/rules/python3-aiofiles.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-aiofiles.targetinstall:
> @$(call install_fixup, python3-aiofiles, DESCRIPTION, missing)
>
> @$(call install_glob, python3-aiofiles, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/aiofiles,, *.py)
> + $(PYTHON3_SITEPACKAGES)/aiofiles,, *.py)
>
> @$(call install_finish, python3-aiofiles)
>
> diff --git a/rules/python3-aiohttp-json-rpc.make b/rules/python3-aiohttp-json-rpc.make
> index 771eacdeff40..f8df71e53125 100644
> --- a/rules/python3-aiohttp-json-rpc.make
> +++ b/rules/python3-aiohttp-json-rpc.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-aiohttp-json-rpc.targetinstall:
> @$(call install_fixup, python3-aiohttp-json-rpc, DESCRIPTION, missing)
>
> @$(call install_glob, python3-aiohttp-json-rpc, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/aiohttp_json_rpc,, *.py)
> + $(PYTHON3_SITEPACKAGES)/aiohttp_json_rpc,, *.py)
>
> @$(call install_finish, python3-aiohttp-json-rpc)
>
> diff --git a/rules/python3-aiohttp-wsgi.make b/rules/python3-aiohttp-wsgi.make
> index 896b3217eb6e..7b183213070d 100644
> --- a/rules/python3-aiohttp-wsgi.make
> +++ b/rules/python3-aiohttp-wsgi.make
> @@ -33,7 +33,7 @@ PYTHON3_AIOHTTP_WSGI_CONF_TOOL := python3
> # Target-Install
> # ----------------------------------------------------------------------------
>
> -PYTHON3_AIOHTTP_WSGI_PYTHON_PATH = /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/aiohttp_wsgi
> +PYTHON3_AIOHTTP_WSGI_PYTHON_PATH = $(PYTHON3_SITEPACKAGES)/aiohttp_wsgi
>
> $(STATEDIR)/python3-aiohttp-wsgi.targetinstall:
> @$(call targetinfo)
> diff --git a/rules/python3-aiohttp.make b/rules/python3-aiohttp.make
> index 628a35a5dd8d..2cfec8749043 100644
> --- a/rules/python3-aiohttp.make
> +++ b/rules/python3-aiohttp.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-aiohttp.targetinstall:
> @$(call install_fixup, python3-aiohttp,DESCRIPTION,missing)
>
> @$(call install_glob, python3-aiohttp, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/aiohttp,, *.py)
> + $(PYTHON3_SITEPACKAGES)/aiohttp,, *.py)
>
> @$(call install_finish, python3-aiohttp)
>
> diff --git a/rules/python3-async-timeout.make b/rules/python3-async-timeout.make
> index 6db040974263..620e73e9ae5d 100644
> --- a/rules/python3-async-timeout.make
> +++ b/rules/python3-async-timeout.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-async-timeout.targetinstall:
> @$(call install_fixup, python3-async-timeout, DESCRIPTION, missing)
>
> @$(call install_glob, python3-async-timeout, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/async_timeout,, *.py)
> + $(PYTHON3_SITEPACKAGES)/async_timeout,, *.py)
>
> @$(call install_finish, python3-async-timeout)
>
> diff --git a/rules/python3-attrs.make b/rules/python3-attrs.make
> index ba25f8db33e4..cd32a351f861 100644
> --- a/rules/python3-attrs.make
> +++ b/rules/python3-attrs.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-attrs.targetinstall:
> @$(call install_fixup, python3-attrs, DESCRIPTION, missing)
>
> @$(call install_glob, python3-attrs, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-attrs)
>
> diff --git a/rules/python3-cffi.make b/rules/python3-cffi.make
> index 978af8af691e..261284916bc8 100644
> --- a/rules/python3-cffi.make
> +++ b/rules/python3-cffi.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-cffi.targetinstall:
> @$(call install_fixup, python3-cffi, DESCRIPTION, missing)
>
> @$(call install_glob, python3-cffi, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/cffi,, *.py *.h)
> + $(PYTHON3_SITEPACKAGES)/cffi,, *.py *.h)
>
> @$(call install_lib, python3-cffi, 0, 0, 0644, python$(PYTHON3_MAJORMINOR)/site-packages/_cffi_backend.cpython*)
>
> diff --git a/rules/python3-chardet.make b/rules/python3-chardet.make
> index 28717255440c..ab3c99f562be 100644
> --- a/rules/python3-chardet.make
> +++ b/rules/python3-chardet.make
> @@ -42,7 +42,7 @@ $(STATEDIR)/python3-chardet.targetinstall:
> @$(call install_fixup, python3-chardet,DESCRIPTION,missing)
>
> @$(call install_glob, python3-chardet, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/chardet,, *.py)
> + $(PYTHON3_SITEPACKAGES)/chardet,, *.py)
>
> @$(call install_finish, python3-chardet)
>
> diff --git a/rules/python3-dateutil.make b/rules/python3-dateutil.make
> index 743a558506f3..0e4cbfcfc12a 100644
> --- a/rules/python3-dateutil.make
> +++ b/rules/python3-dateutil.make
> @@ -40,7 +40,7 @@ $(STATEDIR)/python3-dateutil.targetinstall:
> @$(call install_fixup,python3-dateutil,DESCRIPTION,missing)
>
> @$(call install_glob, python3-dateutil, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/dateutil,, *.py)
> + $(PYTHON3_SITEPACKAGES)/dateutil,, *.py)
>
> @$(call install_finish,python3-dateutil)
>
> diff --git a/rules/python3-decorator.make b/rules/python3-decorator.make
> index 28e8d3ddf9b2..98f200ab6d71 100644
> --- a/rules/python3-decorator.make
> +++ b/rules/python3-decorator.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-decorator.targetinstall:
> @$(call install_fixup, python3-decorator, DESCRIPTION, missing)
>
> @$(call install_copy, python3-decorator, 0, 0, 0644, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/decorator.pyc)
> + $(PYTHON3_SITEPACKAGES)/decorator.pyc)
>
> @$(call install_finish, python3-decorator)
>
> diff --git a/rules/python3-django.make b/rules/python3-django.make
> index 2927445b3038..ffc73a4b8d0d 100644
> --- a/rules/python3-django.make
> +++ b/rules/python3-django.make
> @@ -33,7 +33,7 @@ PYTHON3_DJANGO_CONF_TOOL := python3
> # Target-Install
> # ----------------------------------------------------------------------------
>
> -PYTHON3_DJANGO_PYTHON_PATH = /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/django
> +PYTHON3_DJANGO_PYTHON_PATH = $(PYTHON3_SITEPACKAGES)/django
>
> $(STATEDIR)/python3-django.targetinstall:
> @$(call targetinfo)
> diff --git a/rules/python3-gbulb.make b/rules/python3-gbulb.make
> index c75b93d3f52b..3db63a4a8477 100644
> --- a/rules/python3-gbulb.make
> +++ b/rules/python3-gbulb.make
> @@ -44,7 +44,7 @@ $(STATEDIR)/python3-gbulb.targetinstall:
> "A Python library that implements a PEP 3156 interface for the GLib main event loop.")
>
> @$(call install_glob, python3-gbulb, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/gbulb,, *.py)
> + $(PYTHON3_SITEPACKAGES)/gbulb,, *.py)
>
> @$(call install_finish, python3-gbulb)
>
> diff --git a/rules/python3-gi.make b/rules/python3-gi.make
> index 347d694b8d26..e65a60bdcdcf 100644
> --- a/rules/python3-gi.make
> +++ b/rules/python3-gi.make
> @@ -66,7 +66,7 @@ $(STATEDIR)/python3-gi.targetinstall:
> @$(call install_fixup, python3-gi,DESCRIPTION,missing)
>
> @$(call install_glob, python3-gi, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/gi,, *.py *.la)
> + $(PYTHON3_SITEPACKAGES)/gi,, *.py *.la)
>
> @$(call install_finish, python3-gi)
>
> diff --git a/rules/python3-hbmqtt.make b/rules/python3-hbmqtt.make
> index 078971049217..caeda43dd07c 100644
> --- a/rules/python3-hbmqtt.make
> +++ b/rules/python3-hbmqtt.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-hbmqtt.targetinstall:
> @$(call install_fixup, python3-hbmqtt, DESCRIPTION, missing)
>
> @$(call install_glob, python3-hbmqtt, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/hbmqtt,, *.py)
> + $(PYTHON3_SITEPACKAGES)/hbmqtt,, *.py)
>
> @$(call install_finish, python3-hbmqtt)
>
> diff --git a/rules/python3-importlib-metadata.make b/rules/python3-importlib-metadata.make
> index 088c91516256..c429a6943123 100644
> --- a/rules/python3-importlib-metadata.make
> +++ b/rules/python3-importlib-metadata.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-importlib-metadata.targetinstall:
> @$(call install_fixup, python3-importlib-metadata, DESCRIPTION, missing)
>
> @$(call install_glob, python3-importlib-metadata, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-importlib-metadata)
>
> diff --git a/rules/python3-iniherit.make b/rules/python3-iniherit.make
> index c60c17b8da98..3a1a80f31a2c 100644
> --- a/rules/python3-iniherit.make
> +++ b/rules/python3-iniherit.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-iniherit.targetinstall:
> @$(call install_fixup, python3-iniherit,DESCRIPTION,missing)
>
> @$(call install_glob,python3-iniherit, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,*.pyc,)
> + $(PYTHON3_SITEPACKAGES),*.pyc,)
>
> @$(call install_finish, python3-iniherit)
>
> diff --git a/rules/python3-ipython-genutils.make b/rules/python3-ipython-genutils.make
> index 90cbddec6407..9a49b7502cb7 100644
> --- a/rules/python3-ipython-genutils.make
> +++ b/rules/python3-ipython-genutils.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-ipython-genutils.targetinstall:
> @$(call install_fixup, python3-ipython-genutils, DESCRIPTION, missing)
>
> @$(call install_glob, python3-ipython-genutils, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/ipython_genutils,, *.py)
> + $(PYTHON3_SITEPACKAGES)/ipython_genutils,, *.py)
>
> @$(call install_finish, python3-ipython-genutils)
>
> diff --git a/rules/python3-ipython.make b/rules/python3-ipython.make
> index ca495e621250..04a3da6b4fcf 100644
> --- a/rules/python3-ipython.make
> +++ b/rules/python3-ipython.make
> @@ -55,7 +55,7 @@ $(STATEDIR)/python3-ipython.targetinstall:
>
> # # We have to install the source code to avoid python3 error: "OSError: could not get source code"
> @$(call install_glob, python3-ipython, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/IPython,, *.pyc)
> + $(PYTHON3_SITEPACKAGES)/IPython,, *.pyc)
>
> @$(call install_copy, python3-ipython, 0, 0, 0755, -, /usr/bin/ipython3)
>
> diff --git a/rules/python3-lxml.make b/rules/python3-lxml.make
> index cf4d0870ff2d..d3afee9a9735 100644
> --- a/rules/python3-lxml.make
> +++ b/rules/python3-lxml.make
> @@ -40,7 +40,7 @@ $(STATEDIR)/python3-lxml.targetinstall:
> @$(call install_fixup,python3-lxml,DESCRIPTION,missing)
>
> @$(call install_glob, python3-lxml, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/lxml,, *.py)
> + $(PYTHON3_SITEPACKAGES)/lxml,, *.py)
>
> @$(call install_finish,python3-lxml)
>
> diff --git a/rules/python3-mako.make b/rules/python3-mako.make
> index bb793f4b8119..c896ba74bd1e 100644
> --- a/rules/python3-mako.make
> +++ b/rules/python3-mako.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-mako.targetinstall:
> @$(call install_fixup, python3-mako,DESCRIPTION,missing)
>
> @$(call install_glob, python3-mako, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/mako,, *.py)
> + $(PYTHON3_SITEPACKAGES)/mako,, *.py)
>
> @$(call install_finish, python3-mako)
>
> diff --git a/rules/python3-more-itertools.make b/rules/python3-more-itertools.make
> index 1e6fde836e77..f73c3a311224 100644
> --- a/rules/python3-more-itertools.make
> +++ b/rules/python3-more-itertools.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-more-itertools.targetinstall:
> @$(call install_fixup, python3-more-itertools, DESCRIPTION, missing)
>
> @$(call install_glob, python3-more-itertools, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-more-itertools)
>
> diff --git a/rules/python3-msgpack.make b/rules/python3-msgpack.make
> index 2b5f6d2a1a0a..b2056be541ad 100644
> --- a/rules/python3-msgpack.make
> +++ b/rules/python3-msgpack.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-msgpack.targetinstall:
> @$(call install_fixup, python3-msgpack, DESCRIPTION, It`s like JSON. But fast and small.)
>
> @$(call install_glob, python3-msgpack, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/msgpack,, *.py)
> + $(PYTHON3_SITEPACKAGES)/msgpack,, *.py)
>
> @$(call install_finish, python3-msgpack)
>
> diff --git a/rules/python3-multidict.make b/rules/python3-multidict.make
> index 6693277440bb..b8be29bdcf98 100644
> --- a/rules/python3-multidict.make
> +++ b/rules/python3-multidict.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-multidict.targetinstall:
> @$(call install_fixup, python3-multidict, DESCRIPTION, missing)
>
> @$(call install_glob, python3-multidict, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/multidict,, *.py)
> + $(PYTHON3_SITEPACKAGES)/multidict,, *.py)
>
> @$(call install_finish, python3-multidict)
>
> diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> index ac3b8161114c..b8b0a19efee4 100644
> --- a/rules/python3-numpy.make
> +++ b/rules/python3-numpy.make
> @@ -58,7 +58,7 @@ $(STATEDIR)/python3-numpy.targetinstall:
> @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
>
> @$(call install_glob, python3-numpy, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
> + $(PYTHON3_SITEPACKAGES)/numpy,, *.py)
>
> @$(call install_finish, python3-numpy)
>
> diff --git a/rules/python3-opcua.make b/rules/python3-opcua.make
> index 54e38249cec3..e1d0b5dec06f 100644
> --- a/rules/python3-opcua.make
> +++ b/rules/python3-opcua.make
> @@ -40,7 +40,7 @@ $(STATEDIR)/python3-opcua.targetinstall:
> @$(call install_fixup,python3-opcua,DESCRIPTION,missing)
>
> @$(call install_glob, python3-opcua, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/opcua,, *.py)
> + $(PYTHON3_SITEPACKAGES)/opcua,, *.py)
>
> @$(call install_finish,python3-opcua)
>
> diff --git a/rules/python3-packaging.make b/rules/python3-packaging.make
> index 89b7443b9e82..e8e2e79b9be0 100644
> --- a/rules/python3-packaging.make
> +++ b/rules/python3-packaging.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-packaging.targetinstall:
> @$(call install_fixup, python3-packaging, DESCRIPTION, missing)
>
> @$(call install_glob, python3-packaging, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-packaging)
>
> diff --git a/rules/python3-path-py.make b/rules/python3-path-py.make
> index 002cbefba45b..b7fef082f1bb 100644
> --- a/rules/python3-path-py.make
> +++ b/rules/python3-path-py.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-path-py.targetinstall:
> @$(call install_fixup, python3-path-py, DESCRIPTION, missing)
>
> @$(call install_copy, python3-path-py, 0, 0, 0644, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/path.pyc)
> + $(PYTHON3_SITEPACKAGES)/path.pyc)
>
> @$(call install_finish, python3-path-py)
>
> diff --git a/rules/python3-pexpect.make b/rules/python3-pexpect.make
> index 99afa8a5ace7..ea71885413de 100644
> --- a/rules/python3-pexpect.make
> +++ b/rules/python3-pexpect.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-pexpect.targetinstall:
> @$(call install_fixup, python3-pexpect, DESCRIPTION, missing)
>
> @$(call install_glob, python3-pexpect, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pexpect,, *.py)
> + $(PYTHON3_SITEPACKAGES)/pexpect,, *.py)
>
> @$(call install_finish, python3-pexpect)
>
> diff --git a/rules/python3-pickleshare.make b/rules/python3-pickleshare.make
> index dcc1c184f824..f25ece57c881 100644
> --- a/rules/python3-pickleshare.make
> +++ b/rules/python3-pickleshare.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-pickleshare.targetinstall:
> @$(call install_fixup, python3-pickleshare, DESCRIPTION, missing)
>
> @$(call install_copy, python3-pickleshare, 0, 0, 0644, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pickleshare.pyc)
> + $(PYTHON3_SITEPACKAGES)/pickleshare.pyc)
>
> @$(call install_finish, python3-pickleshare)
>
> diff --git a/rules/python3-pluggy.make b/rules/python3-pluggy.make
> index c8997788ef47..e1ce33765eb4 100644
> --- a/rules/python3-pluggy.make
> +++ b/rules/python3-pluggy.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-pluggy.targetinstall:
> @$(call install_fixup, python3-pluggy, DESCRIPTION, missing)
>
> @$(call install_glob, python3-pluggy, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-pluggy)
>
> diff --git a/rules/python3-ply.make b/rules/python3-ply.make
> index e269a33889b9..5e2aa6aa0e7e 100644
> --- a/rules/python3-ply.make
> +++ b/rules/python3-ply.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-ply.targetinstall:
> @$(call install_fixup, python3-ply, DESCRIPTION, missing)
>
> @$(call install_glob, python3-ply, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/ply,, *.py)
> + $(PYTHON3_SITEPACKAGES)/ply,, *.py)
>
> @$(call install_finish, python3-ply)
>
> diff --git a/rules/python3-ptyprocess.make b/rules/python3-ptyprocess.make
> index c15b01a44c10..fdfd0f4e4ae6 100644
> --- a/rules/python3-ptyprocess.make
> +++ b/rules/python3-ptyprocess.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-ptyprocess.targetinstall:
> @$(call install_fixup, python3-ptyprocess, DESCRIPTION, missing)
>
> @$(call install_glob, python3-ptyprocess, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/ptyprocess,, *.py)
> + $(PYTHON3_SITEPACKAGES)/ptyprocess,, *.py)
>
> @$(call install_finish, python3-ptyprocess)
>
> diff --git a/rules/python3-py.make b/rules/python3-py.make
> index f1e80b9150eb..74e86672418c 100644
> --- a/rules/python3-py.make
> +++ b/rules/python3-py.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-py.targetinstall:
> @$(call install_fixup, python3-py, DESCRIPTION, missing)
>
> @$(call install_glob, python3-py, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-py)
>
> diff --git a/rules/python3-pyalsaaudio.make b/rules/python3-pyalsaaudio.make
> index ccafe261de43..fc957b94d79f 100644
> --- a/rules/python3-pyalsaaudio.make
> +++ b/rules/python3-pyalsaaudio.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-pyalsaaudio.targetinstall:
> @$(call install_fixup, python3-pyalsaaudio, DESCRIPTION, missing)
>
> @$(call install_glob, python3-pyalsaaudio, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,*/alsaaudio*.so)
> + $(PYTHON3_SITEPACKAGES),*/alsaaudio*.so)
>
> @$(call install_finish, python3-pyalsaaudio)
>
> diff --git a/rules/python3-pycparser.make b/rules/python3-pycparser.make
> index 2f51326742d3..3751af220ccd 100644
> --- a/rules/python3-pycparser.make
> +++ b/rules/python3-pycparser.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-pycparser.targetinstall:
> @$(call install_fixup, python3-pycparser, DESCRIPTION, missing)
>
> @$(call install_glob, python3-pycparser, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pycparser,, *.py)
> + $(PYTHON3_SITEPACKAGES)/pycparser,, *.py)
>
> @$(call install_finish, python3-pycparser)
>
> diff --git a/rules/python3-pyparsing.make b/rules/python3-pyparsing.make
> index 1c2087574388..51dbed7a4cb3 100644
> --- a/rules/python3-pyparsing.make
> +++ b/rules/python3-pyparsing.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-pyparsing.targetinstall:
> @$(call install_fixup, python3-pyparsing, DESCRIPTION, missing)
>
> @$(call install_glob, python3-pyparsing, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-pyparsing)
>
> diff --git a/rules/python3-pyside.make b/rules/python3-pyside.make
> index 08cbd1052124..58155f29b9bb 100644
> --- a/rules/python3-pyside.make
> +++ b/rules/python3-pyside.make
> @@ -51,7 +51,7 @@ $(STATEDIR)/python3-pyside.targetinstall:
> @$(call install_lib, python3-pyside, 0, 0, 0644, \
> libpyside.cpython-*)
> @$(call install_tree, python3-pyside, 0, 0, -,\
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/PySide)
> + $(PYTHON3_SITEPACKAGES)/PySide)
>
> @$(call install_finish, python3-pyside)
>
> diff --git a/rules/python3-pytest.make b/rules/python3-pytest.make
> index 34aea11ffce0..328adce474fa 100644
> --- a/rules/python3-pytest.make
> +++ b/rules/python3-pytest.make
> @@ -56,7 +56,7 @@ $(STATEDIR)/python3-pytest.targetinstall:
> @$(call install_fixup, python3-pytest, DESCRIPTION, missing)
>
> @$(call install_glob, python3-pytest, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/,, *.py)
> + $(PYTHON3_SITEPACKAGES)/,, *.py)
> @$(call install_copy, python3-pytest, 0, 0, 0755, -, /usr/bin/pytest)
> @$(call install_link, python3-pytest, pytest, /usr/bin/py.test)
>
> diff --git a/rules/python3-pytz.make b/rules/python3-pytz.make
> index 81b9438a046a..bf7bb982a640 100644
> --- a/rules/python3-pytz.make
> +++ b/rules/python3-pytz.make
> @@ -40,7 +40,7 @@ $(STATEDIR)/python3-pytz.targetinstall:
> @$(call install_fixup,python3-pytz,DESCRIPTION,missing)
>
> @$(call install_glob, python3-pytz, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pytz,, *.py */zoneinfo*)
> + $(PYTHON3_SITEPACKAGES)/pytz,, *.py */zoneinfo*)
>
> @$(call install_finish,python3-pytz)
>
> diff --git a/rules/python3-pyyaml.make b/rules/python3-pyyaml.make
> index 908135417b26..971fc79a9bec 100644
> --- a/rules/python3-pyyaml.make
> +++ b/rules/python3-pyyaml.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-pyyaml.targetinstall:
> @$(call install_fixup, python3-pyyaml, DESCRIPTION, missing)
>
> @$(call install_glob, python3-pyyaml, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/yaml,, *.py)
> + $(PYTHON3_SITEPACKAGES)/yaml,, *.py)
>
> @$(call install_finish, python3-pyyaml)
>
> diff --git a/rules/python3-setuptools.make b/rules/python3-setuptools.make
> index 4e3552a5f86d..7cabb6ece076 100644
> --- a/rules/python3-setuptools.make
> +++ b/rules/python3-setuptools.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-setuptools.targetinstall:
> @$(call install_fixup, python3-setuptools,DESCRIPTION,missing)
>
> @$(call install_glob,python3-setuptools, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-setuptools)
>
> diff --git a/rules/python3-simplegeneric.make b/rules/python3-simplegeneric.make
> index dfe811f8c4bc..b0428959ed05 100644
> --- a/rules/python3-simplegeneric.make
> +++ b/rules/python3-simplegeneric.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-simplegeneric.targetinstall:
> @$(call install_fixup, python3-simplegeneric, DESCRIPTION, missing)
>
> @$(call install_copy, python3-simplegeneric, 0, 0, 0644, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/simplegeneric.pyc)
> + $(PYTHON3_SITEPACKAGES)/simplegeneric.pyc)
>
> @$(call install_finish, python3-simplegeneric)
>
> diff --git a/rules/python3-six.make b/rules/python3-six.make
> index 5f269cdcd075..7ce9529649ad 100644
> --- a/rules/python3-six.make
> +++ b/rules/python3-six.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-six.targetinstall:
> @$(call install_fixup, python3-six,DESCRIPTION,missing)
>
> @$(call install_glob, python3-six, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-six)
>
> diff --git a/rules/python3-systemd.make b/rules/python3-systemd.make
> index ee10af279f33..fe20b0959cc0 100644
> --- a/rules/python3-systemd.make
> +++ b/rules/python3-systemd.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-systemd.targetinstall:
> @$(call install_fixup, python3-systemd,DESCRIPTION,missing)
>
> @$(call install_glob, python3-systemd, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/systemd,, *.py)
> + $(PYTHON3_SITEPACKAGES)/systemd,, *.py)
>
> @$(call install_finish, python3-systemd)
>
> diff --git a/rules/python3-text-unidecode.make b/rules/python3-text-unidecode.make
> index ef9cb558b665..60534ad45911 100644
> --- a/rules/python3-text-unidecode.make
> +++ b/rules/python3-text-unidecode.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-text-unidecode.targetinstall:
> @$(call install_fixup, python3-text-unidecode,DESCRIPTION,missing)
>
> @$(call install_glob,python3-text-unidecode, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,*.pyc *.bin, )
> + $(PYTHON3_SITEPACKAGES),*.pyc *.bin, )
>
> @$(call install_finish, python3-text-unidecode)
>
> diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make
> index 350cf7de1c8d..1dea021a30f7 100644
> --- a/rules/python3-tornado.make
> +++ b/rules/python3-tornado.make
> @@ -40,7 +40,7 @@ $(STATEDIR)/python3-tornado.targetinstall:
> @$(call install_fixup,python3-tornado,DESCRIPTION,missing)
>
> @$(call install_glob, python3-tornado, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/tornado,, *.py)
> + $(PYTHON3_SITEPACKAGES)/tornado,, *.py)
>
> @$(call install_finish,python3-tornado)
>
> diff --git a/rules/python3-traitlets.make b/rules/python3-traitlets.make
> index 54e917dc75c2..712624950ded 100644
> --- a/rules/python3-traitlets.make
> +++ b/rules/python3-traitlets.make
> @@ -42,7 +42,7 @@ $(STATEDIR)/python3-traitlets.targetinstall:
> @$(call install_fixup, python3-traitlets, DESCRIPTION, missing)
>
> @$(call install_glob, python3-traitlets, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/traitlets,, *.py)
> + $(PYTHON3_SITEPACKAGES)/traitlets,, *.py)
>
> @$(call install_finish, python3-traitlets)
>
> diff --git a/rules/python3-transitions.make b/rules/python3-transitions.make
> index f84ff89ff40f..e9eb491f21a8 100644
> --- a/rules/python3-transitions.make
> +++ b/rules/python3-transitions.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-transitions.targetinstall:
> @$(call install_fixup, python3-transitions, DESCRIPTION, missing)
>
> @$(call install_glob, python3-transitions, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/transitions,, *.py)
> + $(PYTHON3_SITEPACKAGES)/transitions,, *.py)
>
> @$(call install_finish, python3-transitions)
>
> diff --git a/rules/python3-wcwidth.make b/rules/python3-wcwidth.make
> index e986eff132af..1040b480e88e 100644
> --- a/rules/python3-wcwidth.make
> +++ b/rules/python3-wcwidth.make
> @@ -45,7 +45,7 @@ $(STATEDIR)/python3-wcwidth.targetinstall:
> @$(call install_fixup, python3-wcwidth, DESCRIPTION, missing)
>
> @$(call install_glob, python3-wcwidth, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-wcwidth)
>
> diff --git a/rules/python3-websockets.make b/rules/python3-websockets.make
> index a54fb9acb409..ce3f293e27ff 100644
> --- a/rules/python3-websockets.make
> +++ b/rules/python3-websockets.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-websockets.targetinstall:
> @$(call install_fixup, python3-websockets, DESCRIPTION, missing)
>
> @$(call install_glob, python3-websockets, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/websockets,, *.py)
> + $(PYTHON3_SITEPACKAGES)/websockets,, *.py)
>
> @$(call install_finish, python3-websockets)
>
> diff --git a/rules/python3-yarl.make b/rules/python3-yarl.make
> index 56b385ecffbb..79aafc17fcd9 100644
> --- a/rules/python3-yarl.make
> +++ b/rules/python3-yarl.make
> @@ -43,7 +43,7 @@ $(STATEDIR)/python3-yarl.targetinstall:
> @$(call install_fixup, python3-yarl, DESCRIPTION, missing)
>
> @$(call install_glob, python3-yarl, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/yarl,, *.py)
> + $(PYTHON3_SITEPACKAGES)/yarl,, *.py)
>
> @$(call install_finish, python3-yarl)
>
> diff --git a/rules/python3-zipp.make b/rules/python3-zipp.make
> index a743971e9847..217ffba2e6a7 100644
> --- a/rules/python3-zipp.make
> +++ b/rules/python3-zipp.make
> @@ -51,7 +51,7 @@ $(STATEDIR)/python3-zipp.targetinstall:
> @$(call install_fixup, python3-zipp, DESCRIPTION, missing)
>
> @$(call install_glob, python3-zipp, 0, 0, -, \
> - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py)
> + $(PYTHON3_SITEPACKAGES),, *.py)
>
> @$(call install_finish, python3-zipp)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2020-08-17 6:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 10:56 [ptxdist] [PATCH] " Philipp Zabel
2020-08-17 6:18 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1k7YTM-0008AM-IT@dude02.hi.pengutronix.de \
--to=mol@pengutronix.de \
--cc=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox