| Message ID | 20181124232139.14782-1-angelo@amarulasolutions.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/pkg-python: fixing wrong root an prefix | expand |
Hello, On Sun, 25 Nov 2018 00:21:39 +0100, Angelo Compagnucci wrote: > Some python software refers to setuptool/distutils options > to install files in python root directory (like data_files option). > To use this type of option, python root should point to the real python > root in buildroot folder and not to the guest os /. > Prefix path is always built starting from the python root, so it should > be simply /usr. > > Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> > --- > package/pkg-python.mk | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) Even though this is really a fix, it's quite late to apply this to master, so close to the release. So I erred on the same side, and applied it to the next branch. If everything goes well, we can still put it back on master before or after the release. Thanks! Thomas
diff --git a/package/pkg-python.mk b/package/pkg-python.mk index f57e486dad..38c5941777 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -42,10 +42,12 @@ PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ - --prefix=$(TARGET_DIR)/usr + --prefix=/usr \ + --root=$(TARGET_DIR) \ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ - --prefix=$(STAGING_DIR)/usr + --prefix=/usr \ + --root=$(STAGING_DIR) # Host distutils-based packages HOST_PKG_PYTHON_DISTUTILS_ENV = \ @@ -66,16 +68,16 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ _python_exec_prefix=/usr PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ - --prefix=$(TARGET_DIR)/usr \ + --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ - --root=/ + --root=$(TARGET_DIR) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ - --prefix=$(STAGING_DIR)/usr \ + --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ - --root=/ + --root=$(STAGING_DIR) # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
Some python software refers to setuptool/distutils options to install files in python root directory (like data_files option). To use this type of option, python root should point to the real python root in buildroot folder and not to the guest os /. Prefix path is always built starting from the python root, so it should be simply /usr. Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> --- package/pkg-python.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)