From 49bf417618a5c9699ebcdfde82f8cb9ccbd5a00a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 4 Apr 2020 14:10:33 +0200 Subject: [PATCH] package/libselinux: bear the kernel options munging Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Clayton Shotwell Cc: Matt Weber Cc: Marcus Folkesson Reviewed-by: Matt Weber Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 8 -------- package/libselinux/libselinux.mk | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 71495de143..6e2006836e 100644 --- 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 258065b79d..d0e7b66241 100644 --- 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)) -- 2.30.2