diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2017-09-04 22:59:49 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@windriver.com> | 2017-09-13 19:48:51 -0500 |
commit | 1d3df562b781c7c9f9c54e65f2ac5972d2a0b022 (patch) | |
tree | c2c6f84c4cb81bc21fdb343eccc5a9df179e1fcd /recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch | |
parent | a5b5f5b328fa7f059fbfe8480bd107379bfe8d21 (diff) | |
download | meta-selinux-1d3df562b781c7c9f9c54e65f2ac5972d2a0b022.tar.gz |
selinux-python: add package 2.7 (20170804)
Move packages to python/*:
- policycoreutils/semanage -> python/semanage
- policycoreutils/audit2allow -> python/audit2allow
- policycoreutils/sepolgen-ifgen -> python/audit2allow/sepolgen-ifgen
- policycoreutils/sepolicy -> python/sepolicy
- policycoreutils/scripts/chcat -> python/chcat
- sepolgen -> python/sepolgen
* Move and rebase patches:
- policycoreutils-fix-TypeError-for-seobject.py.patch
- policycoreutils-fix-sepolicy-install-path.patch
- policycoreutils-process-ValueError-for-sepolicy-seobject.patch
* Cleanup policycoreutils.inc and policycoreutils_2.7.bb
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Update policycoreutils_git.bb
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch')
-rw-r--r-- | recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch b/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch new file mode 100644 index 0000000..617908a --- /dev/null +++ b/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | Subject: [PATCH] policycoreutils: fix install path for new pymodule sepolicy | ||
2 | |||
3 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
4 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
5 | --- | ||
6 | sepolicy/Makefile | 4 +++- | ||
7 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
8 | |||
9 | diff --git a/sepolicy/Makefile b/sepolicy/Makefile | ||
10 | index 2b8716c..70f4bdd 100644 | ||
11 | --- a/sepolicy/Makefile | ||
12 | +++ b/sepolicy/Makefile | ||
13 | @@ -12,6 +12,8 @@ BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions | ||
14 | SHAREDIR ?= $(PREFIX)/share/sandbox | ||
15 | override CFLAGS = -I$(PREFIX)/include -DPACKAGE="policycoreutils" -Wall -Werror -Wextra -W -DSHARED -shared | ||
16 | |||
17 | +PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') | ||
18 | + | ||
19 | BASHCOMPLETIONS=sepolicy-bash-completion.sh | ||
20 | |||
21 | all: python-build | ||
22 | @@ -30,7 +32,7 @@ test: | ||
23 | @python test_sepolicy.py -v | ||
24 | |||
25 | install: | ||
26 | - $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` | ||
27 | + $(PYTHON) setup.py install --install-lib $(LIBDIR)/$(PYLIBVER)/site-packages | ||
28 | [ -d $(BINDIR) ] || mkdir -p $(BINDIR) | ||
29 | install -m 755 sepolicy.py $(BINDIR)/sepolicy | ||
30 | (cd $(BINDIR); ln -sf sepolicy sepolgen) | ||
31 | -- | ||
32 | 1.7.9.5 | ||
33 | |||