package/glibc: install utilities into their standard locations
authorPeter Korsgaard <peter@korsgaard.com>
Sat, 23 Nov 2019 12:40:15 +0000 (13:40 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Sat, 23 Nov 2019 12:42:20 +0000 (13:42 +0100)
As pointed out by Carlos, ldconfig normally goes into /sbin, and getconf +
ldd into /usr/bin, so do that here as well instead of installing everything
to /bin.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/glibc/glibc.mk

index 5cb19aabb982b634663e08652b4e9591fc77e456..5da0b064a2207bb767cd6bca0f5b26f0147e57ab 100644 (file)
@@ -144,15 +144,20 @@ GLIBC_LIBS_LIB += libthread_db.so.*
 endif
 
 ifeq ($(BR2_PACKAGE_GLIBC_UTILS),y)
-GLIBC_TARGET_UTILS_BIN = posix/getconf elf/ldconfig elf/ldd
+GLIBC_TARGET_UTILS_USR_BIN = posix/getconf elf/ldd
+GLIBC_TARGET_UTILS_SBIN = elf/ldconfig
+
 endif
 
 define GLIBC_INSTALL_TARGET_CMDS
        for libpattern in $(GLIBC_LIBS_LIB); do \
                $(call copy_toolchain_lib_root,$$libpattern) ; \
        done
-       $(foreach util,$(GLIBC_TARGET_UTILS_BIN), \
-               $(INSTALL) -D -m 0755 $(@D)/build/$(util) $(TARGET_DIR)/bin/$(notdir $(util))
+       $(foreach util,$(GLIBC_TARGET_UTILS_USR_BIN), \
+               $(INSTALL) -D -m 0755 $(@D)/build/$(util) $(TARGET_DIR)/usr/bin/$(notdir $(util))
+       )
+       $(foreach util,$(GLIBC_TARGET_UTILS_SBIN), \
+               $(INSTALL) -D -m 0755 $(@D)/build/$(util) $(TARGET_DIR)/sbin/$(notdir $(util))
        )
 endef