python-ipy: remove recipe
PATCH 1/6 python-ipy: remove recipe
The python-ipy had been moved to meta-python.
--- recipes-devtools/python/python-ipy.inc | 18 ------------------ recipes-devtools/python/python-ipy_1.00.bb | 2 -- recipes-devtools/python/python3-ipy_1.00.bb | 2 -- 3 files changed, 22 deletions(-) delete mode 100644 recipes-devtools/python/python-ipy.inc delete mode 100644 recipes-devtools/python/python-ipy_1.00.bb delete mode 100644 recipes-devtools/python/python3-ipy_1.00.bb
recipes-devtools/python/python-ipy.inc deleted +0 -18
@@ -1,18 +0,0 @@ -SUMMARY = "Python module for handling IPv4 and IPv6 Addresses and Networks" -DESCRIPTION = "IPy is a Python module for handling IPv4 and IPv6 Addresses and Networks \ -in a fashion similar to perl's Net::IP and friends. The IP class allows \ -a comfortable parsing and handling for most notations in use for IPv4 \ -and IPv6 Addresses and Networks." -SECTION = "devel/python" -HOMEPAGE = "https://github.com/haypo/python-ipy" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=848d24919845901b4f48bae5f13252e6" - -SRC_URI[md5sum] = "1a90c68174234672241a7e60c7ea0fb9" -SRC_URI[sha256sum] = "2f2bf658a858d43868d8a4352b3889cf78c66e2ce678b300dcf518c9149ba621" - -inherit pypi - -PYPI_PACKAGE = "IPy" - -BBCLASSEXTEND = "native"
recipes-devtools/python/python-ipy_1.00.bb deleted +0 -2
@@ -1,2 +0,0 @@ -inherit setuptools -require python-ipy.inc
recipes-devtools/python/python3-ipy_1.00.bb deleted +0 -2
@@ -1,2 +0,0 @@ -inherit setuptools3 -require python-ipy.inc
Signature · 1 line
2.17.1
PATCH 2/6 libselinux-python: fix race issue in parallel build
The install-pywarp target doesn't depend on swigify target because the selinux.py is not generated by swigify target but pywrap target. Here is the dependency chain:
install-pywrap -> pywrap -> $(SWIGFILES) -> $(SWIGPYOUT) -> $(SWIGCOUT) -> selinux.py
But in the recipe, the swigify target is added explicitly in do_install:
do_install_append() {
oe_runmake install-pywrap swigify \
[snip]}
This target will regenerate the selinux.py when do_install. So there will be a potential race issue in parallel build. The install-pywrap target is trying to install selinux.py when swigify target is generating the file. Then an empty selinux.py will be installed. Remove the target swigify to fix this issue.
--- recipes-security/selinux/libselinux-python.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/selinux/libselinux-python.inc +1 -1
@@ -33,7 +33,7 @@ do_compile() { } do_install() { - oe_runmake install-pywrap swigify \ + oe_runmake install-pywrap \ PYCEXT='.so' \ PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ PYTHONLIBDIR='${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages'
Signature · 1 line
2.17.1
PATCH 3/6 libsemanage: fix race issue in parallel build
In reply to Yi ZhaoThe install-pywarp target doesn't depend on swigify target because the semanage.py is not generated by swigify target but pywrap target. Here is the dependency chain:
install-pywrap -> pywrap -> $(SWIGSO) -> $(SWIGLOBJ) -> $(SWIGCOUT) -> semanage.py
But in the recipe, the swigify target is added explicitly in do_install:
do_install_append() {
oe_runmake install-pywrap swigify \
[snip]}
This target will regenerate the semanage.py when do_install. So there will be a potential race issue in parallel build. The install-pywrap target is trying to install semanage.py when swigify target is generating the file. Then an empty semanage.py will be installed. Remove the target swigify to fix this issue.
--- recipes-security/selinux/libsemanage.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/selinux/libsemanage.inc +1 -1
@@ -32,7 +32,7 @@ do_compile_append() { } do_install_append() { - oe_runmake install-pywrap swigify \ + oe_runmake install-pywrap \ PYCEXT='.so' \ PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ PYTHONLIBDIR='${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages'
Signature · 1 line
2.17.1
PATCH 4/6 selinux-initsh.inc: install selinux-init.sh and selinux-labeldev.sh when using systemd
In reply to Yi ZhaoThe commit 5fd3c5b71edb99659aeb5cb5903088d84517382e introduced an issue that selinux-init.sh and selinux-labeldev.sh are not installed when using systemd which will cause the selinux-ini.service and selinux-labeldev.service fail to startup. Move the do_install codes from selinux-autorelabel to selinux-initsh.inc to make sure install these scripts when using systemd.
--- recipes-security/selinux/selinux-autorelabel_0.1.bb | 3 --- recipes-security/selinux/selinux-initsh.inc | 9 +++++++-- 2 files changed, 7 insertions(+), 5 deletions(-)
recipes-security/selinux/selinux-autorelabel_0.1.bb +0 -3
@@ -21,9 +21,6 @@ require selinux-initsh.inc do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.sh ${D}${bindir} - sed -i -e '/.*HERE$/d' ${D}${bindir}/${SELINUX_SCRIPT_SRC}.sh echo "# first boot relabelling" > ${D}/.autorelabel fi }
recipes-security/selinux/selinux-initsh.inc +7 -2
@@ -27,8 +27,13 @@ do_install () { -e '/.*HERE$/d' -e '/.*Contents.*sysvinit/d' \ ${D}${sysconfdir}/init.d/${SELINUX_SCRIPT_DST} - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.service ${D}${systemd_unitdir}/system + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.sh ${D}${bindir} + sed -i -e '/.*HERE$/d' ${D}${bindir}/${SELINUX_SCRIPT_SRC}.sh + fi } sysroot_stage_all_append () {
Signature · 1 line
2.17.1
Re: [meta-selinux][PATCH 4/6] selinux-initsh.inc: install selinux-init.sh and selinux-labeldev.sh when using systemd
Hi Yi,
I've merged the others in this series, can you elaborate a bit on how this ensures we don't have a problem coming back that 5fd3c5b71 was intended to address?
Thanks,
-J.
Quoted 50 lines · [[meta-selinux][PATCH 4/6] selinux-initsh.inc: install selinux-init.sh and…
The commit
5fd3c5b71edb99659aeb5cb5903088d84517382eintroduced an issue thatselinux-init.shandselinux-labeldev.share not installed when using systemd which will cause the selinux-ini.service and selinux-labeldev.service fail to startup. Move thedo_installcodes from selinux-autorelabel to selinux-initsh.inc to make sure install these scripts when using systemd.Signed-off-by Yi Zhao <[email protected]>--- recipes-security/selinux/selinux-autorelabel_0.1.bb | 3 --- recipes-security/selinux/selinux-initsh.inc | 9 +++++++-- 2 files changed, 7 insertions(+), 5 deletions(-)recipes-security/selinux/selinux-autorelabel_0.1.bb +0
-3@@ -21,9 +21,6 @@ require selinux-initsh.inc do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.sh ${D}${bindir} - sed -i -e '/.*HERE$/d' ${D}${bindir}/${SELINUX_SCRIPT_SRC}.sh echo "# first boot relabelling" > ${D}/.autorelabel fi }recipes-security/selinux/selinux-initsh.inc +7
-2@@ -27,8 +27,13 @@ do_install () { -e '/.*HERE$/d' -e '/.*Contents.*sysvinit/d' \ ${D}${sysconfdir}/init.d/${SELINUX_SCRIPT_DST} - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.service ${D}${systemd_unitdir}/system + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.sh ${D}${bindir} + sed -i -e '/.*HERE$/d' ${D}${bindir}/${SELINUX_SCRIPT_SRC}.sh + fi } sysroot_stage_all_append () {Signature · 1 line
2.17.1
Signature · 2 lines
-Joe MacDonald. :wq
Re: [meta-selinux][PATCH 4/6] selinux-initsh.inc: install selinux-init.sh and selinux-labeldev.sh when using systemd
Quoted 5 lines · Joe MacDonald
Hi Yi,
I've merged the others in this series, can you elaborate a bit on how this ensures we don't have a problem coming back that
5fd3c5b71was intended to address?
There are 3 recipes require selinux-initsh.inc: selinux-init_0.1.bb, selinux-labeldev_0.1.bb and selinux-autorelabel_0.1.bb. The ${SELINUX_SCRIPT_SRC}.sh will expand to different script name in each of recipes: selinux-init.sh, selinux-labeldev.sh and selinux-autorelabel.sh. These scripts will be invoked by systemd services. The commit 5fd3c5b71edb99659aeb5cb5903088d84517382e move all installation codes to selinux-autorelabel_0.1.bb which make the selinux-init.sh and selinux-labeldev.sh will be not installed. This patch keeps the touching .autorelabel code in the selinux-autorelabel recipe and move the rest codes back to selinux-initsh.inc.
//Yi
Quoted 56 lines
Thanks,
-J.Quoted 50 lines · [[meta-selinux][PATCH 4/6] selinux-initsh.inc: install selinux-init.sh and…
The commit
5fd3c5b71edb99659aeb5cb5903088d84517382eintroduced an issue thatselinux-init.shandselinux-labeldev.share not installed when using systemd which will cause the selinux-ini.service and selinux-labeldev.service fail to startup. Move thedo_installcodes from selinux-autorelabel to selinux-initsh.inc to make sure install these scripts when using systemd.Signed-off-by Yi Zhao <[email protected]>--- recipes-security/selinux/selinux-autorelabel_0.1.bb | 3 --- recipes-security/selinux/selinux-initsh.inc | 9 +++++++-- 2 files changed, 7 insertions(+), 5 deletions(-)recipes-security/selinux/selinux-autorelabel_0.1.bb +0
-3@@ -21,9 +21,6 @@ require selinux-initsh.inc do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.sh ${D}${bindir} - sed -i -e '/.*HERE$/d' ${D}${bindir}/${SELINUX_SCRIPT_SRC}.sh echo "# first boot relabelling" > ${D}/.autorelabel fi }recipes-security/selinux/selinux-initsh.inc +7
-2@@ -27,8 +27,13 @@ do_install () { -e '/.*HERE$/d' -e '/.*Contents.*sysvinit/d' \ ${D}${sysconfdir}/init.d/${SELINUX_SCRIPT_DST} - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.service ${D}${systemd_unitdir}/system + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.sh ${D}${bindir} + sed -i -e '/.*HERE$/d' ${D}${bindir}/${SELINUX_SCRIPT_SRC}.sh + fi } sysroot_stage_all_append () {Signature · 1 line
2.17.1
PATCH 5/6 refpolicy: add UPSTREAM_CHECK_GITTAGREGEX
In reply to Yi ZhaoAdd UPSTREAM_CHECK_GITTAGREGEX to make devtool check-upgrade-status works.
--- recipes-security/refpolicy/refpolicy_2.20190201.inc | 2 ++ recipes-security/refpolicy/refpolicy_git.inc | 2 ++ 2 files changed, 4 insertions(+)
recipes-security/refpolicy/refpolicy_2.20190201.inc +2 -0
@@ -2,6 +2,8 @@ SRC_URI = "https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE SRC_URI[md5sum] = "babb0d5ca2ae333631d25392b2b3ce8d" SRC_URI[sha256sum] = "ed620dc91c4e09eee6271b373f7c61a364a82ea57bd2dc86ca1f7075304e2843" +UPSTREAM_CHECK_GITTAGREGEX = "RELEASE_(?P<pver>\d+_\d+)" + FILESEXTRAPATHS_prepend := "${THISDIR}/refpolicy-2.20190201:" include refpolicy_common.inc
recipes-security/refpolicy/refpolicy_git.inc +2 -0
@@ -4,6 +4,8 @@ SRC_URI = "git://github.com/SELinuxProject/refpolicy.git;protocol=git;branch=mas SRCREV_refpolicy ?= "df696a325404b84c2c931c85356510005e5e6916" +UPSTREAM_CHECK_GITTAGREGEX = "RELEASE_(?P<pver>\d+_\d+)" + FILESEXTRAPATHS_prepend := "${THISDIR}/refpolicy-git:" include refpolicy_common.inc
Signature · 1 line
2.17.1
PATCH 6/6 refpolicy: switch to python3
In reply to Yi Zhao* Switch to python3
* Update policy-version to 31 to match selinux 2.9
--- recipes-security/refpolicy/refpolicy_common.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-security/refpolicy/refpolicy_common.inc +3 -3
@@ -72,12 +72,12 @@ EXTRANATIVEPATH += "bzip2-native" DEPENDS += "bzip2-replacement-native checkpolicy-native policycoreutils-native semodule-utils-native m4-native" RDEPENDS_${PN}-dev =+ " \ - python \ + python3-core \ " PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit pythonnative +inherit python3native PARALLEL_MAKE = ""
@@ -181,7 +181,7 @@ path = ${STAGING_DIR_NATIVE}${sbindir_native}/sefcontext_compile args = \$@ [end] -policy-version = 30 +policy-version = 31 EOF # Create policy store and build the policy
Signature · 1 line
2.17.1