aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2015-11-09 21:48:10 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-11-09 21:48:10 +0100
commit29206817d00f8a00991be771fc3db456b5881597 (patch)
tree96dc10fe923c8df95a123db4d03cba44ea27c17b /system
parentadcc48e0b25fb6a9759bc8d889badbbad9e02954 (diff)
downloadbuildroot-29206817d00f8a00991be771fc3db456b5881597.tar.gz
buildroot-29206817d00f8a00991be771fc3db456b5881597.tar.bz2
system: Fix warning when selecting systemd and ensure merged /usr workarounds are enabled
With systemd and a custom skeleton, we end up with the following warning: warning: (BR2_INIT_SYSTEMD) selects BR2_ROOTFS_MERGED_USR which has unmet direct dependencies (BR2_ROOTFS_SKELETON_DEFAULT) Which makes sense as the logic to install the symlinks to /usr is part of the default skeleton handling, but the BR2_ROOTFS_MERGED_USR symbol is ALSO used by packages to activate various workarounds for a merged /usr, so it should be always active when using systemd even with a custom rootfs skeleton (that by definition must use a merged /usr as required by systemd). So introduce a dummy symbol with the same name for the custom skeleton case, similar to how we handle the BR2_PACKAGE_BUSYBOX_SHOW_OTHERS option. This is a hidden option so it can only be activated by enabling systemd (and not if people just want to use a merged /usr with a custom skeleton but not systemd), but as this is really a legacy option that is probably good enough (if not, patches are welcome!). Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'system')
-rw-r--r--system/Config.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/system/Config.in b/system/Config.in
index 4d070103fd..2e14971ba7 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -179,6 +179,11 @@ config BR2_ROOTFS_SKELETON_CUSTOM_PATH
default "system/skeleton"
help
Path to custom target skeleton.
+
+# dummy config so merged /usr workarounds can also be activated for
+# custom rootfs skeleton
+config BR2_ROOTFS_MERGED_USR
+
endif
if BR2_ROOTFS_SKELETON_DEFAULT