Merge inc file into bb file.
Signed-off-by: Yi Zhao <yi.z...@windriver.com>
---
.../selinux/selinux-python_3.1.bb | 7 -------
...linux-python.inc => selinux-python_3.2.bb} | 20 +++++++++++--------
2 files changed, 12 insertions(+), 15 deletions(-)
delete mode 100644 recipes-security/selinux/selinux-python_3.1.bb
rename recipes-security/selinux/{selinux-python.inc => selinux-python_3.2.bb}
(89%)
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 @@
-require selinux_20200710.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "ec75687b680e0dd63e3ded05bd41cb5a"
-SRC_URI[sha256sum] =
"f4d0a1a030bc291a6af498b26e0676b745075dd289a8ba16cdec86c3ea8f2f02"
diff --git a/recipes-security/selinux/selinux-python.inc
b/recipes-security/selinux/selinux-python_3.2.bb
similarity index 89%
rename from recipes-security/selinux/selinux-python.inc
rename to 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."
DESCRIPTION = "\
This package contains Python modules sepolgen, sepolicy; And the \
SELinux utilities audit2allow, chcat, semanage ..."
-
SECTION = "base"
LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
-SRC_URI += "file://fix-sepolicy-install-path.patch"
+require selinux_common.inc
inherit python3native
+SRC_URI += "file://fix-sepolicy-install-path.patch"
+
+S = "${WORKDIR}/git/python"
+
+EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
+
DEPENDS += "python3 libsepol libselinux"
RDEPENDS_${BPN}-audit2allow += "\
python3-core \
@@ -97,11 +103,9 @@ FILES_${PN} += "\
${libdir}/python${PYTHON_BASEVERSION}/site-packages/sepolicy/* \
"
-EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
-
do_install() {
- oe_runmake DESTDIR="${D}" \
- PYLIBVER='python${PYTHON_BASEVERSION}' \
-
PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
- install
+ oe_runmake DESTDIR="${D}" \
+ PYLIBVER='python${PYTHON_BASEVERSION}' \
+ PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+ install
}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#52700): https://lists.yoctoproject.org/g/yocto/message/52700
Mute This Topic: https://lists.yoctoproject.org/mt/81298600/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
