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>
This commit is contained in:
parent
a1a1f1f5e0
commit
7f971ecf72
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user