summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-03-13 13:50:39 +0800
committerJoe MacDonald <joe@deserted.net>2021-03-17 09:39:50 -0400
commitd34981ff9cea91101ee85fdf9422e542c77862ce (patch)
tree9575a5df89b1273e8dbe0e10c7a6012b368ee879
parent42fc24c32b0036d63165f2416eaf1ca4605a1d94 (diff)
downloadmeta-selinux-d34981ff9cea91101ee85fdf9422e542c77862ce.tar.gz
selinux-python: update to 3.2
Merge inc file into bb file. 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_3.1.bb7
-rw-r--r--recipes-security/selinux/selinux-python_3.2.bb (renamed from recipes-security/selinux/selinux-python.inc)20
2 files changed, 12 insertions, 15 deletions
diff --git a/recipes-security/selinux/selinux-python_3.1.bb b/recipes-security/selinux/selinux-python_3.1.bb
deleted file mode 100644
index a0555d2..0000000
--- a/recipes-security/selinux/selinux-python_3.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require selinux_20200710.inc
2require ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5
6SRC_URI[md5sum] = "ec75687b680e0dd63e3ded05bd41cb5a"
7SRC_URI[sha256sum] = "f4d0a1a030bc291a6af498b26e0676b745075dd289a8ba16cdec86c3ea8f2f02"
diff --git a/recipes-security/selinux/selinux-python.inc b/recipes-security/selinux/selinux-python_3.2.bb
index 827fa8b..a827a90 100644
--- a/recipes-security/selinux/selinux-python.inc
+++ b/recipes-security/selinux/selinux-python_3.2.bb
@@ -2,14 +2,20 @@ SUMMARY = "Python modules and various SELinux utilities."
2DESCRIPTION = "\ 2DESCRIPTION = "\
3This package contains Python modules sepolgen, sepolicy; And the \ 3This package contains Python modules sepolgen, sepolicy; And the \
4SELinux utilities audit2allow, chcat, semanage ..." 4SELinux utilities audit2allow, chcat, semanage ..."
5
6SECTION = "base" 5SECTION = "base"
7LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
8 8
9SRC_URI += "file://fix-sepolicy-install-path.patch" 9require selinux_common.inc
10 10
11inherit python3native 11inherit python3native
12 12
13SRC_URI += "file://fix-sepolicy-install-path.patch"
14
15S = "${WORKDIR}/git/python"
16
17EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
18
13DEPENDS += "python3 libsepol libselinux" 19DEPENDS += "python3 libsepol libselinux"
14RDEPENDS_${BPN}-audit2allow += "\ 20RDEPENDS_${BPN}-audit2allow += "\
15 python3-core \ 21 python3-core \
@@ -97,11 +103,9 @@ FILES_${PN} += "\
97 ${libdir}/python${PYTHON_BASEVERSION}/site-packages/sepolicy/* \ 103 ${libdir}/python${PYTHON_BASEVERSION}/site-packages/sepolicy/* \
98" 104"
99 105
100EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
101
102do_install() { 106do_install() {
103 oe_runmake DESTDIR="${D}" \ 107 oe_runmake DESTDIR="${D}" \
104 PYLIBVER='python${PYTHON_BASEVERSION}' \ 108 PYLIBVER='python${PYTHON_BASEVERSION}' \
105 PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ 109 PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
106 install 110 install
107} 111}