package/audit: 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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/linux/linux.mk b/linux/linux.mk
index eb13920d57f912f84a5a2690bd2a51bbd0320e71..e0a69444eb61ff3b857de285e7a8dafd1b502906 100644 (file)
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -355,9 +355,6 @@ define LINUX_KCONFIG_FIXUP_CMDS
                $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER))
        $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
                $(call KCONFIG_ENABLE_OPT,CONFIG_NET))
-       $(if $(BR2_PACKAGE_AUDIT),
-               $(call KCONFIG_ENABLE_OPT,CONFIG_NET)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT))
        $(if $(BR2_PACKAGE_INTEL_MICROCODE),
                $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE)
                $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL))

diff --git a/package/audit/audit.mk b/package/audit/audit.mk
index 03967ee6502f352d1bd46e692c4bd0c0f041db42..652e0fcd5611724b6b8b5137ccf4014a5c4de991 100644 (file)
--- a/package/audit/audit.mk
+++ b/package/audit/audit.mk
@@ -54,6 +54,11 @@ define AUDIT_INSTALL_CLEANUP
 endef
 AUDIT_POST_INSTALL_TARGET_HOOKS += AUDIT_INSTALL_CLEANUP
 
+define AUDIT_LINUX_CONFIG_FIXUPS
+       $(call KCONFIG_ENABLE_OPT,CONFIG_NET)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT)
+endef
+
 HOST_AUDIT_CONF_OPTS = \
        --without-python \
        --without-python3 \