package/libselinux: bear the kernel options munging

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <aduskett@gmail.com>
Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
Cc: Matt Weber <matthew.weber@rockwellcollins.com>
Cc: Marcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Reviewed-by: Adam Duskett <aduskett@gmail.com>
Tested-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/linux/linux.mk b/linux/linux.mk
index 71495de1438247b4939f9aea3b0ed6741c1e6d0c..6e2006836ea87b62257cb5cdba670131cffa7509 100644 (file)
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -370,14 +370,6 @@ define LINUX_KCONFIG_FIXUP_CMDS
                $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY)
                $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_APPARMOR)
                $(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_APPARMOR))
-       $(if $(BR2_PACKAGE_LIBSELINUX),
-               $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_SELINUX)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_INET)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_NET)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SELINUX))
        $(PACKAGES_LINUX_CONFIG_FIXUPS)
 endef
 

diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk
index 258065b79dd7ae3be102c928bef8372d4ca1b104..d0e7b66241f02c4b24ea53ceda530499f1dc1fbd 100644 (file)
--- a/package/libselinux/libselinux.mk
+++ b/package/libselinux/libselinux.mk
@@ -103,5 +103,15 @@ define HOST_LIBSELINUX_INSTALL_CMDS
                $(HOST_LIBSELINUX_MAKE_OPTS) install-pywrap
 endef
 
+define LIBSELINUX_LINUX_CONFIG_FIXUPS
+       $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_SELINUX)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_INET)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_NET)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SELINUX)
+endef
+
 $(eval $(generic-package))
 $(eval $(host-generic-package))