mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-05-07 04:58:47 +00:00
Code Issues Projects Releases Wiki Activity

apparmor: systemd.bbclas is useful even when disabled

Browse Source 
The systemd bbclass will remove any systemd files that have been installed if
systemd is disabled, so always install the files and always inherit.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Ross Burton
2019-01-14 14:42:06 +00:00
committed by Armin Kuster
parent a648a295dd
commit 230ee1fc35
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-security/AppArmor/apparmor_2.12.bb
+3 -7
View File
@@ -29,8 +29,7 @@ SRC_URI[sha256sum] = "8a2b0cd083faa4d0640f579024be3a629faa7db3b99540798a1a050e2e
PARALLEL_MAKE = ""
inherit pkgconfig autotools-brokensep update-rc.d python3native perlnative ptest cpan manpages
inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
inherit pkgconfig autotools-brokensep update-rc.d python3native perlnative ptest cpan manpages systemd
PACKAGECONFIG ??= "python perl"
PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages"
@@ -101,11 +100,8 @@ do_install () {
install ${WORKDIR}/apparmor ${D}/${INIT_D_DIR}/apparmor
install ${WORKDIR}/functions ${D}/lib/apparmor
if [ "${VIRTUAL-RUNTIME_init_manager}" = "systemd" ]; then
install -d ${D}${systemd_system_unitdir}
install ${WORKDIR}/apparmor.service \
${D}${systemd_system_unitdir}
fi
install -d ${D}${systemd_system_unitdir}
install ${WORKDIR}/apparmor.service ${D}${systemd_system_unitdir}
}
do_compile_ptest () {