From 81d1880f0456383610bbe73406ef7e4769740d82 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 4 Feb 2026 17:24:11 +0100 Subject: [PATCH] package/uclibc: also install utils to STAGING_DIR When BR2_UCLIBC_INSTALL_UTILS is enabled, utils such as getconf, ldd, locale get installed to TARGET_DIR. However, they do not get installed to STAGING_DIR, which is annoying as it means that they are not part of external toolchains built by Buildroot. This commit adjusts the uclibc package to make sure those tools also get installed to STAGING_DIR. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 272d281ba9a06cfdb802ff13d5ca32ef06166cce) Signed-off-by: Thomas Perale --- package/uclibc/uclibc.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index dea5445b16..69eb73510e 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -449,6 +449,14 @@ define UCLIBC_INSTALL_UTILS_TARGET PREFIX=$(TARGET_DIR) \ utils install_utils endef + +define UCLIBC_INSTALL_UTILS_STAGING + $(MAKE1) -C $(@D) \ + CC="$(TARGET_CC)" CPP="$(TARGET_CPP)" LD="$(TARGET_LD)" \ + ARCH="$(UCLIBC_TARGET_ARCH)" \ + PREFIX=$(STAGING_DIR) \ + utils install_utils +endef endif define UCLIBC_INSTALL_TARGET_CMDS @@ -479,6 +487,7 @@ define UCLIBC_INSTALL_STAGING_CMDS RUNTIME_PREFIX=/ \ install_runtime install_dev $(UCLIBC_INSTALL_HOST_UTILS) + $(UCLIBC_INSTALL_UTILS_STAGING) endef # Checks to give errors that the user can understand