aboutsummaryrefslogtreecommitdiff
path: root/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-12-02 08:15:26 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-12-02 08:16:10 +0100
commit13c43455a05b036002e79808ca1c8e0d91d7871b (patch)
tree147ddbfc5486085018bb527de1a43961fc8ee1ca /package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
parent2e08c7398a47b414c288ea516514adac3edf00fb (diff)
parent0393f5d34433e34e49ff7ce0fb998735453ed4fc (diff)
downloadbuildroot-13c43455a05b036002e79808ca1c8e0d91d7871b.tar.gz
buildroot-13c43455a05b036002e79808ca1c8e0d91d7871b.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch')
-rw-r--r--package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch b/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
new file mode 100644
index 0000000000..63344506b2
--- /dev/null
+++ b/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
@@ -0,0 +1,42 @@
+From bc36cba1393120e65bfe4d0f642fd8d38010c0f7 Mon Sep 17 00:00:00 2001
+From: Matt Weber <matthew.weber@rockwellcollins.com>
+Date: Wed, 28 Nov 2018 20:49:00 -0600
+Subject: [PATCH] setup.py: drop path prefix from man install
+
+If the directory is a relative path, it is interpreted relative to the
+installation prefix (Python's sys.prefix for pure-Python packages,
+sys.exec_prefix for packages that contain extension modules).
+So the sys.prefix should not be joined because the correct one will be
+added regardless. The reason why a relative path is going to work is
+because the installation path is built internally joining python root
+with python prefix, thus forming the correct path $(TARGET_DIR)/usr.
+(https://docs.python.org/3/distutils/setupscript.html#installing-additional-files)
+
+For this man file install scenario, joining the sys.prefix makes the
+path absolute (this was previously working by accident).
+
+Upstream: https://github.com/SELinuxProject/setools/pull/13/commits/bc36cba1393120e65bfe4d0f642fd8d38010c0f7
+
+Cc: Angelo Compagnucci <angelo.compagnucci@gmail.com>
+Cc: Arnout Vandecappelle <arnout@mind.be>
+Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 3767fbc..80e0400 100644
+--- a/setup.py
++++ b/setup.py
+@@ -136,7 +136,7 @@ setup(name='setools',
+ cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
+ packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
+ scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+- data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
++ data_files=[('share/man/man1', glob.glob("man/*.1"))],
+ package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
+ ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
+ annotate=cython_annotate,
+--
+1.9.1
+