aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-05-01 15:46:58 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-05-01 15:50:29 +0200
commit7292a5a0723a2dee8ccda0084f5af8100a5760a9 (patch)
tree72124af222b572cbbb9b2f2590431b6d90b91061
parent391c448acbb9a66ddb43804dbcea677da0651a8f (diff)
downloadbuildroot-7292a5a0723a2dee8ccda0084f5af8100a5760a9.tar.gz
buildroot-7292a5a0723a2dee8ccda0084f5af8100a5760a9.tar.bz2
package/libapparmor: bear the kernel options munging
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--linux/linux.mk5
-rw-r--r--package/libapparmor/libapparmor.mk7
2 files changed, 7 insertions, 5 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index ad2efd948a..69bbad99e1 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -363,11 +363,6 @@ define LINUX_KCONFIG_FIXUP_CMDS
$(call KCONFIG_ENABLE_OPT,CONFIG_FB)
$(call KCONFIG_ENABLE_OPT,CONFIG_LOGO)
$(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224))
- $(if $(BR2_PACKAGE_LIBAPPARMOR),
- $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT)
- $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY)
- $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_APPARMOR)
- $(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_APPARMOR))
$(PACKAGES_LINUX_CONFIG_FIXUPS)
endef
diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk
index db5839b07c..9562cd105f 100644
--- a/package/libapparmor/libapparmor.mk
+++ b/package/libapparmor/libapparmor.mk
@@ -38,4 +38,11 @@ else
LIBAPPARMOR_CONF_OPTS += --without-python
endif
+define LIBAPPARMOR_LINUX_CONFIG_FIXUPS
+ $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_APPARMOR)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_APPARMOR)
+endef
+
$(eval $(autotools-package))