package/libapparmor: bear the kernel options munging

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/linux/linux.mk b/linux/linux.mk
index ad2efd948a711743bbe1e1f61524f25395bc2848..69bbad99e1ed296c887c2655601ac7ae02354dd2 100644 (file)
--- 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 db5839b07c55bd24b7512f18940f7924fd90b478..9562cd105f93c21ae0dd7c6aa496b34948d49c79 100644 (file)
--- 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))