system: Fix warning when selecting systemd and ensure merged /usr workarounds are...

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>

diff --git a/system/Config.in b/system/Config.in
index 4d070103fd91cf90a78d32fb78ce24baad499881..2e14971ba79c78a091e6d1b5466acc54c51b242d 100644 (file)
--- 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