From 3c631c741c35f4afd9c7b6a41bcbcae40ecf8d49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 12 Sep 2018 16:17:54 +0200 Subject: [PATCH] system: update Config.in comment about systemd dependencies In commit 879fa7f82a86ffdc6d1cf7c9bfbb5cf830583d69, the BR2_INIT_SYSTEMD option was changed to allow selecting with a uClibc toolchain. Unfortunately, the corresponding Config.in comment, which was already bogus, was not updated to take into account the numerous dependencies of BR2_INIT_SYSTEMD. Due to this, even if you have uClibc enabled, the BR2_INIT_SYSTEMD option may not be visible, and the Config.in comment may also not be visible, leaving the user in the dark. This commit fixes the dependencies of the Config.in comment so that they match the one of the BR2_INIT_SYSTEMD option. Reported-by: Raphael Jacob Cc: Raphael Jacob Signed-off-by: Thomas Petazzoni --- system/Config.in | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/system/Config.in b/system/Config.in index d14a864ca5..f63f27b126 100644 --- a/system/Config.in +++ b/system/Config.in @@ -137,9 +137,15 @@ config BR2_INIT_SYSTEMD select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD -comment "systemd needs a glibc or uClibc toolchain, headers >= 3.10" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC \ - && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10) +comment "systemd needs a glibc or uClibc toolchain w/ wchar, threads, SSP, dynamic library, headers >= 3.10" + depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ + !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_SSP || \ + BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 config BR2_INIT_NONE bool "None" -- 2.30.2