[Buildroot] [git commit] getent: look for glibc's getent in more places
Peter Korsgaard
peter at korsgaard.com
Thu Oct 16 09:01:45 UTC 2014
commit: http://git.buildroot.net/buildroot/commit/?id=7f971ecf722e19a3f1ac9db4c3391097d189f4df
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
External toolchains don't always install the executable in /usr/bin -
God knows why. So check in a few more places.
We can use make's $(wildcard ...) here, because the variable only gets
expanded when the install step is executed, and by that time the
STAGING_DIR has already been installed.
Probably fixes most getent autobuilder errors, at least if fixes
http://autobuild.buildroot.net/results/615b9d17f713b4a53192efb00188560a76b9efa3/
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
package/getent/getent.mk | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/package/getent/getent.mk b/package/getent/getent.mk
index dd08478..18f0991 100644
--- a/package/getent/getent.mk
+++ b/package/getent/getent.mk
@@ -14,7 +14,11 @@ GETENT_LICENSE = LGPLv2.1+
# the C library. For other toolchains, we use the wrapper script
# included in this package.
ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
-GETENT_LOCATION = $(STAGING_DIR)/usr/bin/getent
+# Sourcery toolchains install it in sysroot/usr/lib/bin
+# Buildroot toolchains install it in sysroot/usr/bin
+GETENT_LOCATION = $(firstword $(wildcard \
+ $(STAGING_DIR)/usr/bin/getent \
+ $(STAGING_DIR)/usr/lib/bin/getent))
else
GETENT_LOCATION = package/getent/getent
endif
More information about the buildroot
mailing list