Skip to contentSkip to conversation

libselinux: query for python site-packages dir directly

PATCH New Matt Weber 3 participants 3 messages Apr 4, 2017

lore
Share & tools
lore

Matt Weber

author
#0 lore raw

PATCH 1/1 libselinux: query for python site-packages dir directly

With the bump to version 2.6, the following commit needs to be taken into consideration for overloading paths.
https://github.com/SELinuxProject/selinux/commit/8162f10e670da963eb65ccf1e7de69ea85aba30d

The PYLIBVER is no longer used and the PYTHONLIBDIR is renamed to PYSITEDIR with slightly different pathing.

More details can be found in the issue ticket which was marked as a non-issue after analysis that a Buildroot fix was the resolution.
https://github.com/SELinuxProject/selinux/issues/51

Signed-off-by Matthew Weber <[email protected]>
---
 package/libselinux/libselinux.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
package/libselinux/libselinux.mk +1 -4
index 44120c4..6bf1b43 100644
@@ -46,12 +46,10 @@ HOST_LIBSELINUX_DEPENDENCIES = \
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 HOST_LIBSELINUX_DEPENDENCIES += host-python3
-HOST_LIBSELINUX_PYTHONLIBDIR = -L$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/
 HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/
 HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
 else
 HOST_LIBSELINUX_DEPENDENCIES += host-python
-HOST_LIBSELINUX_PYTHONLIBDIR = -L$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/
 HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/
 HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
 endif

@@ -60,8 +58,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \
 	$(HOST_CONFIGURE_OPTS) \
 	LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \
 	PYINC="$(HOST_LIBSELINUX_PYINC)" \
-	PYTHONLIBDIR="$(HOST_LIBSELINUX_PYTHONLIBDIR)" \
-	PYLIBVER="$(HOST_LIBSELINUX_PYLIBVER)" \
+	PYSITEDIR="$(HOST_DIR)/usr/lib/$(HOST_LIBSELINUX_PYLIBVER)/site-packages" \
 	SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/"
 
 define HOST_LIBSELINUX_BUILD_CMDS
Signature · 1 line
1.9.1
Applied
#1 lore raw

PATCH 1/1 libselinux: query for python site-packages dir directly

Hello,

Quoted 12 lines · Matt Weber

With the bump to version 2.6, the following commit needs to be taken into consideration for overloading paths.
https://github.com/SELinuxProject/selinux/commit/8162f10e670da963eb65ccf1e7de69ea85aba30d

The PYLIBVER is no longer used and the PYTHONLIBDIR is renamed to PYSITEDIR with slightly different pathing.

More details can be found in the issue ticket which was marked as a non-issue after analysis that a Buildroot fix was the resolution.
https://github.com/SELinuxProject/selinux/issues/51

Quoted 4 lines
Signed-off-by Matthew Weber <[email protected]>
---
 package/libselinux/libselinux.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 libselinux: query for python site-packages dir directly

In reply to Matt Weber
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Matt" == Matt Weber <[email protected]> writes:

With the bump to version 2.6, the following commit needs to be taken into consideration for overloading paths.
https://github.com/SELinuxProject/selinux/commit/8162f10e670da963eb65ccf1e7de69ea85aba30d

The PYLIBVER is no longer used and the PYTHONLIBDIR is renamed to PYSITEDIR with slightly different pathing.

Quoted 6 lines

More details can be found in the issue ticket which was marked as a non-issue after analysis that a Buildroot fix was the resolution.
https://github.com/SELinuxProject/selinux/issues/51

Signed-off-by Matthew Weber <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard