Updates to fix building with oe-core master branch
v2 cover Updates to fix building with oe-core master branch
A couple of patches to handle the switch to whinlatter and adapt the recipes for the subsequent S/UNPACKDIR changes.
v2:
Updated patch 0002 commit message to document adding default S definition to selinux_common.inc.
Scott Murray (2):
Set compatible layers to whinlatter
Adapt to UNPACKDIR changes
conf/layer.conf | 2 +- recipes-security/refpolicy/refpolicy_common.inc | 2 +- recipes-security/selinux-scripts/selinux-initsh.inc | 3 +-- recipes-security/selinux/checkpolicy_3.8.1.bb | 2 -- recipes-security/selinux/libselinux-python_3.8.1.bb | 2 +- recipes-security/selinux/libselinux_3.8.1.bb | 2 -- recipes-security/selinux/libsemanage_3.8.1.bb | 2 -- recipes-security/selinux/libsepol_3.8.1.bb | 2 -- recipes-security/selinux/mcstrans_3.8.1.bb | 2 -- recipes-security/selinux/policycoreutils_3.8.1.bb | 2 -- recipes-security/selinux/restorecond_3.8.1.bb | 2 -- recipes-security/selinux/secilc_3.8.1.bb | 2 -- recipes-security/selinux/selinux-dbus_3.8.1.bb | 2 +- recipes-security/selinux/selinux-gui_3.8.1.bb | 2 +- recipes-security/selinux/selinux-python_3.8.1.bb | 2 +- recipes-security/selinux/selinux-sandbox_3.8.1.bb | 2 +- recipes-security/selinux/selinux_common.inc | 2 ++ recipes-security/selinux/semodule-utils_3.8.1.bb | 2 -- recipes-security/setools/setools_4.5.1.bb | 2 -- 19 files changed, 10 insertions(+), 29 deletions(-)
Signature · 1 line
2.49.0
PATCH v2 1/2 Set compatible layers to whinlatter
whinlatter is the next release, set it as compatible layer since it is not backwards compatible.
--- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +1 -1
@@ -17,7 +17,7 @@ BBFILE_PRIORITY_selinux = "5" # cause compatibility issues with other layers LAYERVERSION_selinux = "1" -LAYERSERIES_COMPAT_selinux = "walnascar styhead" +LAYERSERIES_COMPAT_selinux = "whinlatter" LAYERDEPENDS_selinux = " \ core \
Signature · 1 line
2.49.0
PATCH v2 2/2 Adapt to UNPACKDIR changes
In reply to Scott MurrayRemove or update S definitions as required to work with oe-core S/UNPACKDIR changes. A default definition of S has been added to selinux_common.inc to avoid duplication in the set of recipes that use it to build packages from different subdirectories of the selinux repo. The three packagegroups test build successfully with these changes.
--- recipes-security/refpolicy/refpolicy_common.inc | 2 +- recipes-security/selinux-scripts/selinux-initsh.inc | 3 +-- recipes-security/selinux/checkpolicy_3.8.1.bb | 2 -- recipes-security/selinux/libselinux-python_3.8.1.bb | 2 +- recipes-security/selinux/libselinux_3.8.1.bb | 2 -- recipes-security/selinux/libsemanage_3.8.1.bb | 2 -- recipes-security/selinux/libsepol_3.8.1.bb | 2 -- recipes-security/selinux/mcstrans_3.8.1.bb | 2 -- recipes-security/selinux/policycoreutils_3.8.1.bb | 2 -- recipes-security/selinux/restorecond_3.8.1.bb | 2 -- recipes-security/selinux/secilc_3.8.1.bb | 2 -- recipes-security/selinux/selinux-dbus_3.8.1.bb | 2 +- recipes-security/selinux/selinux-gui_3.8.1.bb | 2 +- recipes-security/selinux/selinux-python_3.8.1.bb | 2 +- recipes-security/selinux/selinux-sandbox_3.8.1.bb | 2 +- recipes-security/selinux/selinux_common.inc | 2 ++ recipes-security/selinux/semodule-utils_3.8.1.bb | 2 -- recipes-security/setools/setools_4.5.1.bb | 2 -- 18 files changed, 9 insertions(+), 28 deletions(-)
recipes-security/refpolicy/refpolicy_common.inc +1 -1
@@ -75,7 +75,7 @@ SRC_URI += " \ file://0057-policy-modules-system-logging-make-syslogd_runtime_t.patch \ " -S = "${WORKDIR}/refpolicy" +S = "${UNPACKDIR}/refpolicy" CONFFILES:${PN} = "${sysconfdir}/selinux/config" FILES:${PN} += " \
recipes-security/selinux-scripts/selinux-initsh.inc +1 -2
@@ -1,5 +1,4 @@ -S ?= "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" SECTION ?= "base"
recipes-security/selinux/checkpolicy_3.8.1.bb +0 -2
@@ -13,8 +13,6 @@ require selinux_common.inc DEPENDS = "libsepol bison-native" -S = "${WORKDIR}/git/checkpolicy" - do_install:append() { install test/dismod ${D}/${bindir}/sedismod install test/dispol ${D}/${bindir}/sedispol
recipes-security/selinux/libselinux-python_3.8.1.bb +1 -1
@@ -17,7 +17,7 @@ SRC_URI += "\ file://0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch \ " -S = "${WORKDIR}/git/libselinux" +S = "${UNPACKDIR}/${BP}/libselinux" DEPENDS = "libsepol libpcre2 swig-native python3-setuptools-scm-native" DEPENDS:append:libc-musl = " fts"
recipes-security/selinux/libselinux_3.8.1.bb +0 -2
@@ -15,8 +15,6 @@ SRC_URI += "\ file://0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch \ " -S = "${WORKDIR}/git/libselinux" - DEPENDS = "libsepol libpcre2" DEPENDS:append:libc-musl = " fts"
recipes-security/selinux/libsemanage_3.8.1.bb +0 -2
@@ -20,8 +20,6 @@ DEPENDS = "libsepol libselinux python3 bison-native swig-native" DEPENDS:append:class-target = " audit" -S = "${WORKDIR}/git/libsemanage" - EXTRA_OEMAKE:class-native = "DISABLE_AUDIT=y" PACKAGES =+ "${PN}-python"
recipes-security/selinux/libsepol_3.8.1.bb +0 -2
@@ -11,8 +11,6 @@ require selinux_common.inc inherit lib_package -S = "${WORKDIR}/git/libsepol" - DEPENDS = "flex-native" BBCLASSEXTEND = "native"
recipes-security/selinux/mcstrans_3.8.1.bb +0 -2
@@ -22,8 +22,6 @@ EXTRA_OEMAKE = "SBINDIR=${base_sbindir} \ SYSTEMDDIR=${systemd_unitdir} \ " -S = "${WORKDIR}/git/mcstrans" - do_install:append() { install -d ${D}${sbindir} install -m 755 utils/untranscon ${D}${sbindir}/
recipes-security/selinux/policycoreutils_3.8.1.bb +0 -2
@@ -21,8 +21,6 @@ PAM_SRC_URI = "file://pam.d/newrole \ DEPENDS = "libsepol libselinux libsemanage gettext-native" DEPENDS:append:class-target = " libcap-ng" -S = "${WORKDIR}/git/policycoreutils" - inherit selinux python3native RDEPENDS:${PN}-fixfiles = "\
recipes-security/selinux/restorecond_3.8.1.bb +0 -2
@@ -18,8 +18,6 @@ EXTRA_OEMAKE = "SYSTEMDSYSTEMUNITDIR=${systemd_system_unitdir} \ SYSTEMDUSERUNITDIR=${systemd_user_unitdir} \ " -S = "${WORKDIR}/git/restorecond" - FILES:${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \ ${systemd_user_unitdir}/* \ "
recipes-security/selinux/secilc_3.8.1.bb +0 -2
@@ -10,6 +10,4 @@ require selinux_common.inc DEPENDS = "libsepol xmlto-native" -S = "${WORKDIR}/git/secilc" - BBCLASSEXTEND = "native"
recipes-security/selinux/selinux-dbus_3.8.1.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=393a5ca445f6965873eca0259a17f833" require selinux_common.inc -S = "${WORKDIR}/git/dbus" +S = "${UNPACKDIR}/${BP}/dbus" RDEPENDS:${PN} = "python3-core selinux-python-sepolicy"
recipes-security/selinux/selinux-gui_3.8.1.bb +1 -1
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=393a5ca445f6965873eca0259a17f833" require selinux_common.inc -S = "${WORKDIR}/git/gui" +S = "${UNPACKDIR}/${BP}/gui" DEPENDS = "gettext-native" RDEPENDS:${PN} = "python3-core"
recipes-security/selinux/selinux-python_3.8.1.bb +1 -1
@@ -14,7 +14,7 @@ SRC_URI += "file://fix-sepolicy-install-path.patch \ file://0001-sepolicy-set-conf.substitutions-releasever-to-empty-.patch \ " -S = "${WORKDIR}/git/python" +S = "${UNPACKDIR}/${BP}/python" DEPENDS = "libsepol libselinux gettext-native python3-setuptools-scm-native"
recipes-security/selinux/selinux-sandbox_3.8.1.bb +1 -1
@@ -12,7 +12,7 @@ require selinux_common.inc SRC_URI += "file://sandbox-de-bashify.patch \ " -S = "${WORKDIR}/git/sandbox" +S = "${UNPACKDIR}/${BP}/sandbox" DEPENDS = "libselinux libcap-ng gettext-native"
recipes-security/selinux/selinux_common.inc +2 -0
@@ -3,6 +3,8 @@ HOMEPAGE = "https://github.com/SELinuxProject" SRC_URI = "git://github.com/SELinuxProject/selinux.git;branch=main;protocol=https" SRCREV = "8e9157bbeea1899b7b8b257e7eaa71efef3fffed" +S = "${UNPACKDIR}/${BP}/${BPN}" + UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" do_compile() {
recipes-security/selinux/semodule-utils_3.8.1.bb +0 -2
@@ -10,8 +10,6 @@ require selinux_common.inc DEPENDS = "libsepol" -S = "${WORKDIR}/git/semodule-utils" - PACKAGES =+ "\ ${PN}-semodule-expand \ ${PN}-semodule-link \
recipes-security/setools/setools_4.5.1.bb +0 -2
@@ -14,8 +14,6 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=69a7b68f0a4a570d7c0c43465333ecbc \ file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://${S}/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" -S = "${WORKDIR}/git" - DEPENDS = "libsepol libselinux" RDEPENDS:${PN} = "python3-networkx python3-logging libselinux-python"
Signature · 1 line
2.49.0