summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Rapeli <mikko.rapeli@linaro.org>2024-12-20 11:12:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-23 11:35:35 +0000
commit30000c1b3d605c8b7f88baeb87649a4c41d117ca (patch)
tree0b2c77762ae9f0f407263b54c2d0b33775448000
parent44dc34bb2221b3e2b9de08fad94158a2b92982f3 (diff)
downloadpoky-30000c1b3d605c8b7f88baeb87649a4c41d117ca.tar.gz
systemd: add apparmor PACKAGECONFIG support
For meta-security to enable with "apparmor" in DISTRO_FEATURES. (From OE-Core rev: 804b462b826edf04182c77b6405a52a1c9b9b1f6) Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_256.9.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_256.9.bb b/meta/recipes-core/systemd/systemd_256.9.bb
index a9224915c6..c047964953 100644
--- a/meta/recipes-core/systemd/systemd_256.9.bb
+++ b/meta/recipes-core/systemd/systemd_256.9.bb
@@ -69,7 +69,7 @@ PAM_PLUGINS = " \
69" 69"
70 70
71PACKAGECONFIG ??= " \ 71PACKAGECONFIG ??= " \
72 ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam pni-names selinux smack polkit seccomp', d)} \ 72 ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit apparmor efi ldconfig pam pni-names selinux smack polkit seccomp', d)} \
73 ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \ 73 ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \
74 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ 74 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
75 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ 75 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
@@ -132,6 +132,7 @@ PACKAGECONFIG[serial-getty-generator] = ""
132 132
133PACKAGECONFIG[acl] = "-Dacl=enabled,-Dacl=disabled,acl" 133PACKAGECONFIG[acl] = "-Dacl=enabled,-Dacl=disabled,acl"
134PACKAGECONFIG[audit] = "-Daudit=enabled,-Daudit=disabled,audit" 134PACKAGECONFIG[audit] = "-Daudit=enabled,-Daudit=disabled,audit"
135PACKAGECONFIG[apparmor] = "-Dapparmor=enabled,-Dapparmor=disabled,apparmor"
135PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false" 136PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false"
136PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false" 137PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false"
137PACKAGECONFIG[bpf-framework] = "-Dbpf-framework=enabled,-Dbpf-framework=disabled,clang-native bpftool-native libbpf,libbpf" 138PACKAGECONFIG[bpf-framework] = "-Dbpf-framework=enabled,-Dbpf-framework=disabled,clang-native bpftool-native libbpf,libbpf"