package/busybox: invert dependency with systemd
authorYann E. MORIN <yann.morin.1998@free.fr>
Sun, 8 Jul 2018 09:45:37 +0000 (11:45 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Sun, 8 Jul 2018 10:22:14 +0000 (12:22 +0200)
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/busybox/busybox.mk
package/systemd/systemd.mk

index e504924540983ad3ab72faf5a0eb110e8bd15a8c..9d3ea22d96e7f3a741988a328a0e0d4e57f90328 100644 (file)
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+       $(if $(BR2_PACKAGE_SYSTEMD),systemd) \
        $(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \
        $(if $(BR2_PACKAGE_TAR),tar) \
        $(if $(BR2_PACKAGE_TFTPD),tftpd) \
index 04775ee778570c1d41a28a9860e9b24ddbefc25c..d7031ed21d0e7332f730e785378956ae136a4a8e 100644 (file)
@@ -18,12 +18,6 @@ SYSTEMD_DEPENDENCIES = \
 
 SYSTEMD_PROVIDES = udev
 
-# Make sure that systemd will always be built after busybox so that we have
-# a consistent init setup between two builds
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-SYSTEMD_DEPENDENCIES += busybox
-endif
-
 SYSTEMD_CONF_OPTS += \
        -Drootlibdir='/usr/lib' \
        -Dblkid=true \