Skip to contentSkip to conversation

Fix install of adb client when TOOLS is overridden

PATCH New Ben Brown 1 participant 2 messages Aug 2, 2021

lore
Share & tools
lore

Ben Brown

author
#0 lore raw

cover Fix install of adb client when TOOLS is overridden

The following changes since commit 5a9eef2f531cfb051661c53de34e4c6ba6915138:

nginx: upgrade 1.19.6 -> 1.21.1 (2021-07-30 10:42:35 -0700)

are available in the Git repository at:

https://github.com/benjamb/meta-openembedded.git 92c94b1b5688cc4ac686d3801c7a2efc29b6eb38

for you to fetch changes up to 92c94b1b5688cc4ac686d3801c7a2efc29b6eb38:

android-tools: fix install of adb client when TOOLS is overridden (2021-08-02 17:02:18 +0100)

----------------------------------------------------------------

Ben Brown (1):
android-tools: fix install of adb client when TOOLS is overridden

 .../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 1/1 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'.

---
 .../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +1 -1
index e8992346b..fc91e13a5 100644
@@ -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
Signature · 1 line
2.32.0