diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2014-10-15 14:15:22 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-10-16 11:01:45 +0200 |
| commit | 7f971ecf722e19a3f1ac9db4c3391097d189f4df (patch) | |
| tree | 70b53d2c852958d9f706226890d6081cc5a65d6a /package/getent | |
| parent | a1a1f1f5e025d035840901e957d2caeba0779d39 (diff) | |
| download | buildroot-7f971ecf722e19a3f1ac9db4c3391097d189f4df.tar.gz buildroot-7f971ecf722e19a3f1ac9db4c3391097d189f4df.zip | |
getent: look for glibc's getent in more places
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@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/getent')
| -rw-r--r-- | 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 dd0847880d..18f09912a7 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 |
