[incubator-nuttx-apps] 03/03: system/adb: Download the last version of microADB

[pkarashchenko]

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git

commit 02a095bb76b05aa7898aad012a9f7679092b4ace
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Thu Mar 3 02:39:11 2022 +0800

    system/adb: Download the last version of microADB
    
    commit aa9c64896c7d47478656928d4dcf9b1a5e346da7
    Author: Xiang Xiao <xiaoxi...@xiaomi.com>
    Date:   Sat Jan 22 16:41:23 2022 +0800
    
        remove NuttX special code
    
        since the new libuv porting for NuttX doesn't need the special process
    
        Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
    
    Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
 system/adb/Makefile         | 16 +++++++---------
 system/adb/logcat_service.c |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/system/adb/Makefile b/system/adb/Makefile
index f13fff9..98d43e6 100644
--- a/system/adb/Makefile
+++ b/system/adb/Makefile
@@ -20,21 +20,19 @@
 
 include $(APPDIR)/Make.defs
 
-ADB_DIR := $(APPDIR)/system/adb
-CONFIG_ADBD_URL ?= "https://github.com/spiriou/microADB.git";
-CONFIG_ADBD_VERSION ?= b7025c67b866925d1e64c016a844a6a3392557a4
+ADBD_URL ?= "https://github.com/spiriou/microADB/archive";
+ADBD_VERSION ?= a1a12e2452eed9d8fdd008c05b4d93c992bfc0a7
 
+ADB_DIR := $(APPDIR)/system/adb
 ADB_UNPACKNAME := microADB
 ADB_UNPACKDIR := $(ADB_DIR)/$(ADB_UNPACKNAME)
 
 $(ADB_UNPACKDIR):
        @echo "Downloading: $(ADB_UNPACKNAME)"
-       $(call DELDIR, "$@")
-       $(Q) mkdir "$@"
-       $(Q) cd "$@" && git init && \
-       git remote add origin "$(CONFIG_ADBD_URL)" && \
-       git fetch origin $(CONFIG_ADBD_VERSION) --depth=1 && \
-       git reset --hard FETCH_HEAD
+       $(Q) curl -O -L $(ADBD_URL)/$(ADBD_VERSION).zip
+       $(Q) unzip -o $(ADBD_VERSION).zip
+       $(call DELFILE, $(ADBD_VERSION).zip)
+       $(call MOVEFILE, $(ADB_UNPACKNAME)-$(ADBD_VERSION), $(ADB_UNPACKDIR))
 
 # adb server app
 
diff --git a/system/adb/logcat_service.c b/system/adb/logcat_service.c
index ba6bc7f..6771707 100644
--- a/system/adb/logcat_service.c
+++ b/system/adb/logcat_service.c
@@ -105,7 +105,7 @@ static const adb_service_ops_t logcat_ops =
   .on_write_frame = alog_on_write,
   .on_ack_frame   = alog_on_ack,
   .on_kick        = alog_on_kick,
-  .close          = alog_close
+  .on_close       = alog_close
 };
 
 static void logcat_on_data_available(uv_poll_t * handle,