From e96786c6233d2ec32d324c89fe47001b7a7e5579 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 23 Feb 2020 07:59:12 -0300 Subject: [PATCH] package/busybox: fix individual binaries installation 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 Signed-off-by: Yann E. MORIN (cherry picked from commit 3da205b274b121efa92b8ff5eb4a90a19115d1e5) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 565488ce1a..bf3b8aeec8 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -334,6 +334,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) @@ -344,7 +345,6 @@ define BUSYBOX_INSTALL_INIT_SYSV $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) - $(BUSYBOX_INSTALL_INDIVIDUAL_BINARIES) endef # Checks to give errors that the user can understand