From: Carlos Santos Date: Sun, 23 Feb 2020 10:59:12 +0000 (-0300) Subject: package/busybox: fix individual binaries installation X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3da205b274b121efa92b8ff5eb4a90a19115d1e5;p=buildroot.git 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 --- diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 6283bc96ea..dfcd9d392c 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -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