From cc47ebe09e57d06cca543308ad1da2c6673470ae Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 14 Apr 2020 15:41:54 +0800 Subject: selinux-python: upgrade to 3.0 (20191204) Refresh fix-sepolicy-install-path.patch. Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- .../selinux-python/fix-sepolicy-install-path.patch | 23 +++++++--------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'recipes-security/selinux/selinux-python') 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 30a19eb..527e02c 100644 --- a/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch +++ b/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch @@ -1,36 +1,27 @@ -From e57022e3577770188ad3570005b7107a09cf3bb9 Mon Sep 17 00:00:00 2001 +From e8fdfdf96a84209118deff7782cf82f8187af6c5 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Mon, 23 Sep 2013 21:17:59 +0800 Subject: [PATCH] policycoreutils: fix install path for new pymodule sepolicy -Uptream-Status: Pending +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Xin Ouyang Signed-off-by: Wenzong Fan Signed-off-by: Yi Zhao --- - sepolicy/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + sepolicy/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sepolicy/Makefile b/sepolicy/Makefile -index 69f29fa..a18d1c3 100644 +index 69f29fa..b474d80 100644 --- a/sepolicy/Makefile +++ b/sepolicy/Makefile -@@ -9,6 +9,8 @@ BASHCOMPLETIONDIR ?= $(PREFIX)/share/bash-completion/completions - CFLAGS ?= -Wall -Werror -Wextra -W - override CFLAGS += -DPACKAGE="policycoreutils" -DSHARED -shared - -+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') -+ - BASHCOMPLETIONS=sepolicy-bash-completion.sh - - all: python-build -@@ -27,7 +29,7 @@ test: +@@ -27,7 +27,7 @@ test: @$(PYTHON) test_sepolicy.py -v install: - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` -+ $(PYTHON) setup.py install --prefix=$(PREFIX) --install-lib $(DESTDIR)$(LIBDIR)/$(PYLIBVER)/site-packages ++ $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) --no-compile [ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) install -m 755 sepolicy.py $(DESTDIR)$(BINDIR)/sepolicy (cd $(DESTDIR)$(BINDIR); ln -sf sepolicy sepolgen) -- cgit v1.2.3-54-g00ecf