Przeglądaj źródła

package/libapparmor: bear the kernel options munging

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Thomas Petazzoni 5 lat temu
rodzic
commit
7292a5a072
2 zmienionych plików z 7 dodań i 5 usunięć
  1. 0 5
      linux/linux.mk
  2. 7 0
      package/libapparmor/libapparmor.mk

+ 0 - 5
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
 

+ 7 - 0
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))