[meta-security][PATCH] apparmor: pull in coreutils/findutils only when not using systemd as init manager

[meta-security][PATCH] apparmor: pull in coreutils/findutils only when not using systemd as init manager

[Alexander Kanavin]

The utilities from those packages (xargs, comm) are only used in sysvinit
scripts, and so there is no need to pull them in when systemd is in use.
Both are gpl3 licensed, so this is beneficial for builds where gpl3 is not
allowed.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 recipes-mac/AppArmor/apparmor_2.13.4.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-mac/AppArmor/apparmor_2.13.4.bb b/recipes-mac/AppArmor/apparmor_2.13.4.bb
index d6f61b3..552cac7 100644
--- a/recipes-mac/AppArmor/apparmor_2.13.4.bb
+++ b/recipes-mac/AppArmor/apparmor_2.13.4.bb
@@ -191,7 +191,8 @@ PACKAGES += "mod-${PN}"
 FILES_${PN} += "/lib/apparmor/ ${sysconfdir}/apparmor ${PYTHON_SITEPACKAGES_DIR}"
 FILES_mod-${PN} = "${libdir}/apache2/modules/*"
 
-RDEPENDS_${PN} +=  "coreutils findutils ${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}"
+# Add coreutils and findutils only if sysvinit scripts are in use
+RDEPENDS_${PN} +=  "${@["coreutils findutils", ""][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd')]} ${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}"
 RDEPENDS_${PN}_remove += "${@bb.utils.contains('PACKAGECONFIG','perl','','perl', d)}"
 RDEPENDS_${PN}-ptest += "perl coreutils dbus-lib bash"
 
-- 
2.26.2

Re: [yocto] [meta-security][PATCH] apparmor: pull in coreutils/findutils only when not using systemd as init manager

[Armin Kuster]

[-- Attachment #1: Type: text/plain, Size: 1456 bytes --]

merged

On 6/8/20 3:00 AM, Alexander Kanavin wrote:
> The utilities from those packages (xargs, comm) are only used in sysvinit
> scripts, and so there is no need to pull them in when systemd is in use.
> Both are gpl3 licensed, so this is beneficial for builds where gpl3 is not
> allowed.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  recipes-mac/AppArmor/apparmor_2.13.4.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-mac/AppArmor/apparmor_2.13.4.bb b/recipes-mac/AppArmor/apparmor_2.13.4.bb
> index d6f61b3..552cac7 100644
> --- a/recipes-mac/AppArmor/apparmor_2.13.4.bb
> +++ b/recipes-mac/AppArmor/apparmor_2.13.4.bb
> @@ -191,7 +191,8 @@ PACKAGES += "mod-${PN}"
>  FILES_${PN} += "/lib/apparmor/ ${sysconfdir}/apparmor ${PYTHON_SITEPACKAGES_DIR}"
>  FILES_mod-${PN} = "${libdir}/apache2/modules/*"
>  
> -RDEPENDS_${PN} +=  "coreutils findutils ${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}"
> +# Add coreutils and findutils only if sysvinit scripts are in use
> +RDEPENDS_${PN} +=  "${@["coreutils findutils", ""][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd')]} ${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}"
>  RDEPENDS_${PN}_remove += "${@bb.utils.contains('PACKAGECONFIG','perl','','perl', d)}"
>  RDEPENDS_${PN}-ptest += "perl coreutils dbus-lib bash"
>  
>
> 


[-- Attachment #2: Type: text/html, Size: 2087 bytes --]