summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-01-07 11:43:41 +0800
committerJoe MacDonald <joe@deserted.net>2021-01-14 07:12:08 -0500
commitff6fed2b704b11cd402a0ed49e7ccb49ec581686 (patch)
treedcab12f18b9103838de27cebf0d7cffbf9db7673
parent31a0e25809a83e5cbcaaf47569f1f64eaa58df52 (diff)
downloadmeta-selinux-ff6fed2b704b11cd402a0ed49e7ccb49ec581686.tar.gz
selinux-python: upgrade to 3.1 (20200710)
Refresh patch: fix-sepolicy-install-path.patch Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r--recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch12
-rw-r--r--recipes-security/selinux/selinux-python_3.0.bb7
-rw-r--r--recipes-security/selinux/selinux-python_3.1.bb7
3 files changed, 13 insertions, 13 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 527e02c..4e91df7 100644
--- a/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
+++ b/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
@@ -1,7 +1,7 @@
1From e8fdfdf96a84209118deff7782cf82f8187af6c5 Mon Sep 17 00:00:00 2001 1From df40fadfb251cc2aebdbd2e216f99a8ae7da7763 Mon Sep 17 00:00:00 2001
2From: Xin Ouyang <Xin.Ouyang@windriver.com> 2From: Xin Ouyang <Xin.Ouyang@windriver.com>
3Date: Mon, 23 Sep 2013 21:17:59 +0800 3Date: Mon, 23 Sep 2013 21:17:59 +0800
4Subject: [PATCH] policycoreutils: fix install path for new pymodule sepolicy 4Subject: [PATCH] sepolicy: fix install path for new pymodule sepolicy
5 5
6Upstream-Status: Inappropriate [embedded specific] 6Upstream-Status: Inappropriate [embedded specific]
7 7
@@ -13,18 +13,18 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/sepolicy/Makefile b/sepolicy/Makefile 15diff --git a/sepolicy/Makefile b/sepolicy/Makefile
16index 69f29fa..b474d80 100644 16index 3361be4..5842321 100644
17--- a/sepolicy/Makefile 17--- a/sepolicy/Makefile
18+++ b/sepolicy/Makefile 18+++ b/sepolicy/Makefile
19@@ -27,7 +27,7 @@ test: 19@@ -27,7 +27,7 @@ test:
20 @$(PYTHON) test_sepolicy.py -v 20 @$(PYTHON) test_sepolicy.py -v
21 21
22 install: 22 install:
23- $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` 23- $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS)
24+ $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) --no-compile 24+ $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) --no-compile $(PYTHON_SETUP_ARGS)
25 [ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) 25 [ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
26 install -m 755 sepolicy.py $(DESTDIR)$(BINDIR)/sepolicy 26 install -m 755 sepolicy.py $(DESTDIR)$(BINDIR)/sepolicy
27 (cd $(DESTDIR)$(BINDIR); ln -sf sepolicy sepolgen) 27 (cd $(DESTDIR)$(BINDIR); ln -sf sepolicy sepolgen)
28-- 28--
292.7.4 292.17.1
30 30
diff --git a/recipes-security/selinux/selinux-python_3.0.bb b/recipes-security/selinux/selinux-python_3.0.bb
deleted file mode 100644
index 8222d28..0000000
--- a/recipes-security/selinux/selinux-python_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require selinux_20191204.inc
2require ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5
6SRC_URI[md5sum] = "aa018c9b1b26034f84f3f427adac08be"
7SRC_URI[sha256sum] = "43c08fa881ccc64251d396b1ac6c56b354bf98421b4ec937d54a8db190135494"
diff --git a/recipes-security/selinux/selinux-python_3.1.bb b/recipes-security/selinux/selinux-python_3.1.bb
new file mode 100644
index 0000000..a0555d2
--- /dev/null
+++ b/recipes-security/selinux/selinux-python_3.1.bb
@@ -0,0 +1,7 @@
1require selinux_20200710.inc
2require ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5
6SRC_URI[md5sum] = "ec75687b680e0dd63e3ded05bd41cb5a"
7SRC_URI[sha256sum] = "f4d0a1a030bc291a6af498b26e0676b745075dd289a8ba16cdec86c3ea8f2f02"