package/busybox: fix individual binaries installation
authorCarlos Santos <unixmania@gmail.com>
Sun, 23 Feb 2020 10:59:12 +0000 (07:59 -0300)
committerYann E. MORIN <yann.morin.1998@free.fr>
Sun, 23 Feb 2020 12:04:26 +0000 (13:04 +0100)
Call BUSYBOX_INSTALL_INDIVIDUAL_BINARIES in BUSYBOX_INSTALL_TARGET_CMDS,
not in BUSYBOX_INSTALL_INIT_SYSV. This should have been done in commit
b1e07d6d796e67a980d4a05d04c64f00162245ff but was somehow lost during the
review/aply process.

Signed-off-by: Carlos Santos <unixmania@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
package/busybox/busybox.mk

index 6283bc96ea4ead91f4ebf33c338915452a9a0ffc..dfcd9d392c5937d3d9b89182babb1e3663df0f4f 100644 (file)
@@ -349,6 +349,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS
        # Use the 'noclobber' install rule, to prevent BusyBox from overwriting
        # any full-blown versions of apps installed by other packages.
        $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install-noclobber
+       $(BUSYBOX_INSTALL_INDIVIDUAL_BINARIES)
        $(BUSYBOX_INSTALL_INITTAB)
        $(BUSYBOX_INSTALL_UDHCPC_SCRIPT)
        $(BUSYBOX_INSTALL_MDEV_CONF)
@@ -360,7 +361,6 @@ define BUSYBOX_INSTALL_INIT_SYSV
        $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
        $(BUSYBOX_INSTALL_SYSCTL_SCRIPT)
        $(BUSYBOX_INSTALL_TELNET_SCRIPT)
-       $(BUSYBOX_INSTALL_INDIVIDUAL_BINARIES)
 endef
 
 # Checks to give errors that the user can understand