openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-26 11:16:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

setools: Update to 4.4.2, reorganize package

Browse Source 
* Add separate packages for each tool (setools-*) and a package for the
  Python bindings (python3-setools)

* Update the setools package as a meta-package that installs all tools,
  keeping it functionally the same as the current setools package

* Remove gui tool (apol) and Python binding (setoolsgui)

* Simplify 030-remove-host-paths.patch (libraries installed by
  Build/InstallDev are placed in $(STAGING_DIR)/usr/lib only)

* Update package titles, descriptions, license, and dependencies

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To
2023-06-09 17:54:20 +08:00
parent 194cf52a82
commit 6938f58a45
3 changed files with 102 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/setools/patches/010-no-gui.patch Normal file
View File

@@ -0,0 +1,16 @@
--- a/setup.py
+++ b/setup.py
@@ -139,10 +139,10 @@ setup(name='setools',
author_email='pebenito@ieee.org',
url='https://github.com/SELinuxProject/setools',
cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
- packages=['setools', 'setools.checker', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'],
+ packages=['setools', 'setools.checker', 'setools.diff'],
+ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'],
data_files=installed_data,
- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map',
+ package_data={'setools': ['perm_map',
'policyrep.pyi',
'py.typed']},
ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],

5
utils/setools/patches/030-remove-host-paths.patch
View File

@@ -1,12 +1,11 @@
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,8 @@ class QtHelpCommand(Command):
@@ -79,7 +79,7 @@ class QtHelpCommand(Command):
# Library linkage
-lib_dirs = ['.', '/usr/lib64', '/usr/lib', '/usr/local/lib']
+owrt_staging_dir = os.environ["STAGING_DIR"]
+lib_dirs = ['.', owrt_staging_dir + '/usr/lib64', owrt_staging_dir + '/usr/lib', owrt_staging_dir + '/usr/local/lib' ]
+lib_dirs = ['.', os.environ["STAGING_DIR"] + '/usr/lib']
include_dirs = []
with suppress(KeyError):