package/systemd: bear the kernel options munging

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <aduskett@gmail.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/linux/linux.mk b/linux/linux.mk
index 1bf7932a55db89fc68a0597f10bf84a10cc5127d..c122ab70e0f3df88d65fdb4f7f5970c41efdfe9e 100644 (file)
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -357,13 +357,6 @@ define LINUX_KCONFIG_FIXUP_CMDS
                $(call KCONFIG_ENABLE_OPT,CONFIG_NET))
        $(if $(BR2_PACKAGE_LINUX_TOOLS_PERF),
                $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS))
-       $(if $(BR2_PACKAGE_SYSTEMD),
-               $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR))
        $(if $(BR2_PACKAGE_SMACK),
                $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY)
                $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SMACK)

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index b45a70b7ad28763af6478775cae6a98340266849..9f5429fd191a31969771e1cebe44965276f5b10e 100644 (file)
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -551,6 +551,15 @@ SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_PRESET_ALL
 SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV)
 SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV)
 
+define SYSTEMD_LINUX_CONFIG_FIXUPS
+       $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR)
+endef
+
 # We need a very minimal host variant, so we disable as much as possible.
 HOST_SYSTEMD_CONF_OPTS = \
        -Dsplit-bin=true \