From 3f36657af2a203ef77acbff7b0c5be4098c67f25 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Mon, 2 Aug 2021 17:23:27 +0100 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- .../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index e8992346b0..fc91e13a55 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -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