CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

selinux-python: uprev to 2.8 (20180524)

Browse Source 
Rebase patch:
fix-sepolicy-install-path.patch

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Yi Zhao 2018-09-05 08:18:22 +08:00 committed by Joe MacDonald
parent 2de2fca376
commit 82b09d8c63
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-security/selinux/selinux-python.inc
View File

@ -102,7 +102,7 @@ FILES_${PN} += "\
EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
do_install() {
oe_runmake DESTDIR=${D} \
LIBDIR="${D}${libdir}" \
LIBDIR="${libdir}" \
PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
install
}

23
recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
View File

@ -1,4 +1,4 @@
From 69e8697cd2ae48710ff8190bad3e61d2fd115b99 Mon Sep 17 00:00:00 2001
From c1aae6cc131371729f098e4b0aa02142a85b5890 Mon Sep 17 00:00:00 2001
From: Xin Ouyang <Xin.Ouyang@windriver.com>
Date: Mon, 23 Sep 2013 21:17:59 +0800
Subject: [PATCH] policycoreutils: fix install path for new pymodule sepolicy
@ -7,16 +7,16 @@ Uptream-Status: Pending
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
sepolicy/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sepolicy/Makefile b/sepolicy/Makefile
index 5a56e6c..82c3e36 100644
index fb8a132..a6ee749 100644
--- a/sepolicy/Makefile
+++ b/sepolicy/Makefile
@@ -12,6 +12,8 @@ SHAREDIR ?= $(PREFIX)/share/sandbox
@@ -8,6 +8,8 @@ BASHCOMPLETIONDIR ?= $(PREFIX)/share/bash-completion/completions
CFLAGS ?= -Wall -Werror -Wextra -W
override CFLAGS += -DPACKAGE="policycoreutils" -DSHARED -shared
@ -25,12 +25,15 @@ index 5a56e6c..82c3e36 100644
BASHCOMPLETIONS=sepolicy-bash-completion.sh
all: python-build
@@ -30,7 +32,7 @@ test:
@@ -26,7 +28,7 @@ test:
@$(PYTHON) test_sepolicy.py -v
install:
- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
+ $(PYTHON) setup.py install --install-lib $(LIBDIR)/$(PYLIBVER)/site-packages
[ -d $(BINDIR) ] || mkdir -p $(BINDIR)
install -m 755 sepolicy.py $(BINDIR)/sepolicy
(cd $(BINDIR); ln -sf sepolicy sepolgen)
- $(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
[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
install -m 755 sepolicy.py $(DESTDIR)$(BINDIR)/sepolicy
(cd $(DESTDIR)$(BINDIR); ln -sf sepolicy sepolgen)
--
2.7.4

7
recipes-security/selinux/selinux-python_2.7.bb
View File

@ -1,7 +0,0 @@
include selinux_20170804.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SRC_URI[md5sum] = "b118229d34a6aec34471c3c2c9cac172"
SRC_URI[sha256sum] = "4217cb965ecda96c91e15ffcc2e7ddd13ecc2bf5631100f3cd072a7616f140ed"

7
recipes-security/selinux/selinux-python_2.8.bb Normal file
View File

@ -0,0 +1,7 @@
include selinux_20180524.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SRC_URI[md5sum] = "bd9850808203c76f07efd396bde790e3"
SRC_URI[sha256sum] = "e69f5e24820cb247a3d881a9c90efba1e64d76af863c82fb81bc3b87ed71e238"