summaryrefslogtreecommitdiffstats
path: root/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-07-19 13:14:56 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2018-08-13 11:20:32 -0400
commit6551e95179b1a9f7ca611f02ca55956a529389ad (patch)
treee3da2df7fcf58e332f0d6a2fac8f688f23cb0200 /recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
parent65797deb50466454b21a3de4604518116758d7e2 (diff)
downloadmeta-selinux-6551e95179b1a9f7ca611f02ca55956a529389ad.tar.gz
selinux-python: refresh patches to fix QA warning
Refresh patches with devtool command to fix do_patch warning Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.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.patch21
1 files changed, 12 insertions, 9 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
index 617908a..1d54231 100644
--- a/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
+++ b/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
@@ -1,18 +1,24 @@
1From 69e8697cd2ae48710ff8190bad3e61d2fd115b99 Mon Sep 17 00:00:00 2001
2From: Xin Ouyang <Xin.Ouyang@windriver.com>
3Date: Mon, 23 Sep 2013 21:17:59 +0800
1Subject: [PATCH] policycoreutils: fix install path for new pymodule sepolicy 4Subject: [PATCH] policycoreutils: fix install path for new pymodule sepolicy
2 5
6Uptream-Status: Pending
7
3Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> 8Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
4Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 9Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
10
5--- 11---
6 sepolicy/Makefile | 4 +++- 12 sepolicy/Makefile | 4 +++-
7 1 file changed, 3 insertions(+), 1 deletion(-) 13 1 file changed, 3 insertions(+), 1 deletion(-)
8 14
9diff --git a/sepolicy/Makefile b/sepolicy/Makefile 15diff --git a/sepolicy/Makefile b/sepolicy/Makefile
10index 2b8716c..70f4bdd 100644 16index 5a56e6c..82c3e36 100644
11--- a/sepolicy/Makefile 17--- a/sepolicy/Makefile
12+++ b/sepolicy/Makefile 18+++ b/sepolicy/Makefile
13@@ -12,6 +12,8 @@ BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions 19@@ -12,6 +12,8 @@ SHAREDIR ?= $(PREFIX)/share/sandbox
14 SHAREDIR ?= $(PREFIX)/share/sandbox 20 CFLAGS ?= -Wall -Werror -Wextra -W
15 override CFLAGS = -I$(PREFIX)/include -DPACKAGE="policycoreutils" -Wall -Werror -Wextra -W -DSHARED -shared 21 override CFLAGS += -DPACKAGE="policycoreutils" -DSHARED -shared
16 22
17+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') 23+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
18+ 24+
@@ -20,7 +26,7 @@ index 2b8716c..70f4bdd 100644
20 26
21 all: python-build 27 all: python-build
22@@ -30,7 +32,7 @@ test: 28@@ -30,7 +32,7 @@ test:
23 @python test_sepolicy.py -v 29 @$(PYTHON) test_sepolicy.py -v
24 30
25 install: 31 install:
26- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` 32- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
@@ -28,6 +34,3 @@ index 2b8716c..70f4bdd 100644
28 [ -d $(BINDIR) ] || mkdir -p $(BINDIR) 34 [ -d $(BINDIR) ] || mkdir -p $(BINDIR)
29 install -m 755 sepolicy.py $(BINDIR)/sepolicy 35 install -m 755 sepolicy.py $(BINDIR)/sepolicy
30 (cd $(BINDIR); ln -sf sepolicy sepolgen) 36 (cd $(BINDIR); ln -sf sepolicy sepolgen)
31--
321.7.9.5
33