diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2023-03-11 21:13:04 +0800 |
|---|---|---|
| committer | Joe MacDonald <joe@deserted.net> | 2023-03-27 09:34:02 -0400 |
| commit | ff424dc4cfb6e214df1f17ef549aa809bcbac13e (patch) | |
| tree | 14fa8b8549cf67864cca83a2c13fd7c3dbc9d61d /recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch | |
| parent | 1f4cefc8821f88627db3c3630cf0f5c7c643bfc1 (diff) | |
| download | meta-selinux-ff424dc4cfb6e214df1f17ef549aa809bcbac13e.tar.gz | |
selinux-python: upgrade 3.4 -> 3.5
License-Update: Rename COPYING to LICENSE. No content changes.
* Refresh patch.
* Drop backport patch.
* Add dependency python3-setuptools-scm-native to fix build error.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
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 | 8 |
1 files changed, 4 insertions, 4 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 bd14450..5eb2e54 100644 --- a/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch +++ b/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From d43220e336edf8ccaaa7bd3eb9c13874ed34d468 Mon Sep 17 00:00:00 2001 | 1 | From 2a0c2489e9d245502e7a9dc5878da01f9d64db2a Mon Sep 17 00:00:00 2001 |
| 2 | From: Xin Ouyang <Xin.Ouyang@windriver.com> | 2 | From: Xin Ouyang <Xin.Ouyang@windriver.com> |
| 3 | Date: Mon, 23 Sep 2013 21:17:59 +0800 | 3 | Date: Mon, 23 Sep 2013 21:17:59 +0800 |
| 4 | Subject: [PATCH] sepolicy: fix install path for new pymodule sepolicy | 4 | Subject: [PATCH] sepolicy: fix install path for new pymodule sepolicy |
| @@ -13,15 +13,15 @@ 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 | ||
| 15 | diff --git a/sepolicy/Makefile b/sepolicy/Makefile | 15 | diff --git a/sepolicy/Makefile b/sepolicy/Makefile |
| 16 | index 3361be4..5842321 100644 | 16 | index 4e9e93d..512aab5 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)` $(PYTHON_SETUP_ARGS) | 23 | - $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . |
| 24 | + $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) --no-compile $(PYTHON_SETUP_ARGS) | 24 | + $(PYTHON) -m pip install --prefix=$(PREFIX) --root $(DESTDIR) --ignore-installed --no-deps $(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) |