mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
android-tools: fix install of adb client when TOOLS is overridden
Overriding TOOLS with 'adb' as the only entry, or with 'adb' as the
final entry in the list fails to match the grep pattern. The current
pattern includes trailing whitespace, likely to distinguish it from
'adbd'. However since `${TOOLS}` is then passed to grep unquoted, any
trailing whitespace would be dropped by the shell.
Fixed by replacing the trailing whitespace with '\>' to mark the end of
the word, which continues to ensure we don't match against 'adbd'.
Signed-off-by: Ben Brown <ben.brown@codethink.co.uk>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
f0b8ee3702
commit
3f36657af2
@ -133,7 +133,7 @@ do_install() {
|
||||
install -m0755 ${B}/ext4_utils/simg2simg ${D}${bindir}
|
||||
fi
|
||||
|
||||
if echo ${TOOLS} | grep -q "adb " ; then
|
||||
if echo ${TOOLS} | grep -q "adb\>" ; then
|
||||
install -d ${D}${bindir}
|
||||
install -m0755 ${B}/adb/adb ${D}${bindir}
|
||||
fi
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user