[15/22] package/systemd: bear the kernel options munging

Message ID	fc9f563675e70191e70d106e156ef99dd33829ff.1586002215.git.yann.morin.1998@free.fr
State	Accepted
Headers	show Return-Path: <buildroot-bounces@busybox.net> From: "Yann E. MORIN" <yann.morin.1998@free.fr> To: buildroot@buildroot.org Date: Sat, 4 Apr 2020 14:10:27 +0200 Message-Id: <fc9f563675e70191e70d106e156ef99dd33829ff.1586002215.git.yann.morin.1998@free.fr> In-Reply-To: <cover.1586002215.git.yann.morin.1998@free.fr> References: <cover.1586002215.git.yann.morin.1998@free.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 15/22] package/systemd: bear the kernel options munging Precedence: list Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>, Adam Duskett <aduskett@gmail.com>, Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>
Series	[01/22] core/pkg-utils: rationalise kconfig option mangling \| expand [01/22] core/pkg-utils: rationalise kconfig option mangling [02/22] core/pkg-utils: kconfig mangling defaults to current package's .config [04/22] boot/uboot: don't specify .config to munge [05/22] boot/busybox: don't specify .config to munge [06/22] boot/swupdate: don't specify .config to munge [07/22] boot/uclibc: don't specify .config to munge [08/22] linux: don't specify .config to munge [09/22] linux: allow packages to set options [10/22] package/audit: bear the kernel options munging [11/22] package/intel-micro-code: bear the kernel options munging [12/22] package/ktap: bear the kernel options munging [13/22] package/pcm-tools: bear the kernel options munging [14/22] package/linux-tools/perf: bear the kernel options munging [15/22] package/systemd: bear the kernel options munging [16/22] package/smack: bear the kernel options munging [17/22] package/sunxi-mali-mainline-driver: bear the kernel options munging [18/22] package/iptables: bear the kernel options munging [19/22] package/xtables-addons: bear the kernel options munging [20/22] package/wireguard-linux-compat: bear the kernel options munging [21/22] package/libselinux: bear the kernel options munging [22/22] package/kernel-module-imx-gpu-viv: bear the kernel options munging

Message ID

fc9f563675e70191e70d106e156ef99dd33829ff.1586002215.git.yann.morin.1998@free.fr

State

Accepted

Headers

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: buildroot@buildroot.org
Date: Sat,  4 Apr 2020 14:10:27 +0200
Message-Id: <fc9f563675e70191e70d106e156ef99dd33829ff.1586002215.git.yann.morin.1998@free.fr>
In-Reply-To: <cover.1586002215.git.yann.morin.1998@free.fr>
References: <cover.1586002215.git.yann.morin.1998@free.fr>
MIME-Version: 1.0
Subject: [Buildroot] [PATCH 15/22] package/systemd: bear the kernel options
	munging
Precedence: list
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>,
	Adam Duskett <aduskett@gmail.com>,
	Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Series

[01/22] core/pkg-utils: rationalise kconfig option mangling | expand

Commit Message

Yann E. MORIN April 4, 2020, 12:10 p.m. UTC

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <aduskett@gmail.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
 linux/linux.mk             | 7 -------
 package/systemd/systemd.mk | 9 +++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 60fefd0eba..0a504dc615 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -355,13 +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_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 56459947c4..f058c94040 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -519,6 +519,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 \

[15/22] package/systemd: bear the kernel options munging

Commit Message

Patch