From 74bbbc3277fa72cc202aa466d0369b892aaddb0d Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sat, 13 Mar 2021 13:50:36 +0800 Subject: [PATCH] policycoreutils: update to 3.2 Merge inc file into bb file. Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- .../selinux/policycoreutils_3.1.bb | 7 - ...cycoreutils.inc => policycoreutils_3.2.bb} | 143 +++++++++--------- 2 files changed, 74 insertions(+), 76 deletions(-) delete mode 100644 recipes-security/selinux/policycoreutils_3.1.bb rename recipes-security/selinux/{policycoreutils.inc => policycoreutils_3.2.bb} (52%) diff --git a/recipes-security/selinux/policycoreutils_3.1.bb b/recipes-security/selinux/policycoreutils_3.1.bb deleted file mode 100644 index f56d1c3..0000000 --- a/recipes-security/selinux/policycoreutils_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] = "3097ac2c83e47af130452f10399282cb" -SRC_URI[sha256sum] = "c889f62ee80f8b6a369469a9b8af51f5b797975aeaa291f5c5960cc12eed1934" diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils_3.2.bb similarity index 52% rename from recipes-security/selinux/policycoreutils.inc rename to recipes-security/selinux/policycoreutils_3.2.bb index 43a641d..9fc1691 100644 --- a/recipes-security/selinux/policycoreutils.inc +++ b/recipes-security/selinux/policycoreutils_3.2.bb @@ -6,6 +6,9 @@ to switch roles, and run_init to run /etc/init.d scripts in the proper \ context." SECTION = "base" LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833" + +require selinux_common.inc SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://policycoreutils-fixfiles-de-bashify.patch \ @@ -13,92 +16,94 @@ SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', PAM_SRC_URI = "file://pam.d/newrole \ file://pam.d/run_init \ -" + " DEPENDS += "libsepol libselinux libsemanage libcap gettext-native" EXTRA_DEPENDS = "libcap-ng libcgroup" DEPENDS += "${@['', '${EXTRA_DEPENDS}']['${PN}' != '${BPN}-native']}" +S = "${WORKDIR}/git/policycoreutils" + inherit selinux python3native RDEPENDS_${BPN}-fixfiles += "\ - ${BPN}-setfiles \ - grep \ - findutils \ + ${BPN}-setfiles \ + grep \ + findutils \ " RDEPENDS_${BPN}-genhomedircon += "\ - ${BPN}-semodule \ + ${BPN}-semodule \ " RDEPENDS_${BPN}-loadpolicy += "\ - libselinux \ - libsepol \ + libselinux \ + libsepol \ " RDEPENDS_${BPN}-newrole += "\ - libcap-ng \ - libselinux \ + libcap-ng \ + libselinux \ " RDEPENDS_${BPN}-runinit += "libselinux" RDEPENDS_${BPN}-secon += "libselinux" RDEPENDS_${BPN}-semodule += "\ - libsepol \ - libselinux \ - libsemanage \ + libsepol \ + libselinux \ + libsemanage \ " RDEPENDS_${BPN}-sestatus += "libselinux" RDEPENDS_${BPN}-setfiles += "\ - libselinux \ - libsepol \ + libselinux \ + libsepol \ " RDEPENDS_${BPN}-setsebool += "\ - libsepol \ - libselinux \ - libsemanage \ + libsepol \ + libselinux \ + libsemanage \ " RDEPENDS_${BPN} += "selinux-python" PACKAGES =+ "\ - ${PN}-fixfiles \ - ${PN}-genhomedircon \ - ${PN}-hll \ - ${PN}-loadpolicy \ - ${PN}-newrole \ - ${PN}-runinit \ - ${PN}-secon \ - ${PN}-semodule \ - ${PN}-sestatus \ - ${PN}-setfiles \ - ${PN}-setsebool \ + ${PN}-fixfiles \ + ${PN}-genhomedircon \ + ${PN}-hll \ + ${PN}-loadpolicy \ + ${PN}-newrole \ + ${PN}-runinit \ + ${PN}-secon \ + ${PN}-semodule \ + ${PN}-sestatus \ + ${PN}-setfiles \ + ${PN}-setsebool \ " FILES_${PN}-fixfiles += "${base_sbindir}/fixfiles" FILES_${PN}-genhomedircon += "${base_sbindir}/genhomedircon" FILES_${PN}-loadpolicy += "\ - ${base_sbindir}/load_policy \ + ${base_sbindir}/load_policy \ " FILES_${PN}-newrole += "\ - ${bindir}/newrole \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/newrole', '', d)} \ + ${bindir}/newrole \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/newrole', '', d)} \ " FILES_${PN}-runinit += "\ - ${base_sbindir}/run_init \ - ${base_sbindir}/open_init_pty \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/run_init', '', d)} \ + ${base_sbindir}/run_init \ + ${base_sbindir}/open_init_pty \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/run_init', '', d)} \ " FILES_${PN}-dbg += "${prefix}/libexec/selinux/hll/.debug" FILES_${PN}-secon += "${bindir}/secon" FILES_${PN}-semodule += "${base_sbindir}/semodule" FILES_${PN}-hll += "${prefix}/libexec/selinux/hll/*" FILES_${PN}-sestatus += "\ - ${base_sbindir}/sestatus \ - ${sysconfdir}/sestatus.conf \ + ${base_sbindir}/sestatus \ + ${sysconfdir}/sestatus.conf \ " FILES_${PN}-setfiles += "\ - ${base_sbindir}/restorecon \ - ${base_sbindir}/restorecon_xattr \ - ${base_sbindir}/setfiles \ + ${base_sbindir}/restorecon \ + ${base_sbindir}/restorecon_xattr \ + ${base_sbindir}/setfiles \ " FILES_${PN}-setsebool += "\ - ${base_sbindir}/setsebool \ - ${datadir}/bash-completion/completions/setsebool \ + ${base_sbindir}/setsebool \ + ${datadir}/bash-completion/completions/setsebool \ " export STAGING_INCDIR @@ -127,48 +132,48 @@ BBCLASSEXTEND = "native" PCU_NATIVE_CMDS = "setfiles semodule hll" do_compile_class-native() { - for PCU_CMD in ${PCU_NATIVE_CMDS} ; do - oe_runmake -C $PCU_CMD \ - INCLUDEDIR='${STAGING_INCDIR}' \ - LIBDIR='${STAGING_LIBDIR}' - done + for PCU_CMD in ${PCU_NATIVE_CMDS} ; do + oe_runmake -C $PCU_CMD \ + INCLUDEDIR='${STAGING_INCDIR}' \ + LIBDIR='${STAGING_LIBDIR}' + done } sysroot_stage_dirs_append_class-native() { - cp -R $from/${prefix}/libexec $to/${prefix}/libexec + cp -R $from/${prefix}/libexec $to/${prefix}/libexec } do_compile_prepend() { - export PYTHON=python3 - export PYLIBVER='python${PYTHON_BASEVERSION}' - export PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYLIBVER}" - export PYTHON_LDFLAGS="${STAGING_LIBDIR}/lib${PYLIBVER}.so" - export PYTHON_SITE_PKG="${libdir}/${PYLIBVER}/site-packages" + export PYTHON=python3 + export PYLIBVER='python${PYTHON_BASEVERSION}' + export PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYLIBVER}" + export PYTHON_LDFLAGS="${STAGING_LIBDIR}/lib${PYLIBVER}.so" + export PYTHON_SITE_PKG="${libdir}/${PYLIBVER}/site-packages" } do_install_prepend() { - export PYTHON=python3 - export SBINDIR="${D}/${base_sbindir}" + export PYTHON=python3 + export SBINDIR="${D}/${base_sbindir}" } do_install_class-native() { - for PCU_CMD in ${PCU_NATIVE_CMDS} ; do - oe_runmake -C $PCU_CMD install \ - DESTDIR="${D}" \ - PREFIX="${prefix}" \ - SBINDIR="${base_sbindir}" - done + for PCU_CMD in ${PCU_NATIVE_CMDS} ; do + oe_runmake -C $PCU_CMD install \ + DESTDIR="${D}" \ + PREFIX="${prefix}" \ + SBINDIR="${base_sbindir}" + done } do_install_append_class-target() { - if [ -e ${WORKDIR}/pam.d ]; then - install -d ${D}${sysconfdir}/pam.d/ - install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ - fi + if [ -e ${WORKDIR}/pam.d ]; then + install -d ${D}${sysconfdir}/pam.d/ + install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ + fi - # /var/lib/selinux is involved by seobject.py: - # + dirname = "/var/lib/selinux" - # and it's required for running command: - # $ semanage permissive [OPTS] - install -d ${D}${localstatedir}/lib/selinux + # /var/lib/selinux is involved by seobject.py: + # + dirname = "/var/lib/selinux" + # and it's required for running command: + # $ semanage permissive [OPTS] + install -d ${D}${localstatedir}/lib/selinux }