[incubator-nuttx-apps] branch master updated: gpusutils/minmea: Fix build break by wrong unpack path

[xiaoxiang]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1e4165220 gpusutils/minmea: Fix build break by wrong unpack path
1e4165220 is described below

commit 1e4165220ebd52b2226cf0e1924db1be99dc03d0
Author: Huang Qi <huang...@xiaomi.com>
AuthorDate: Mon Aug 29 04:49:24 2022 +0000

    gpusutils/minmea: Fix build break by wrong unpack path
    
    minmea is not cover by CI and in current implementations,
    the source files from downloaded tarball were put into root path in 
gpsutils/minmea instead of in $(MINMEA_DIR)/$(MINMEA_UNPACKNAME),
    and then:
    ```
    mv: cannot stat 'minmea-db46128e73cee26d6a6eb0482dcba544ee1ea9f5': No such 
file or directory
    ```
    
    Signed-off-by: Huang Qi <huang...@xiaomi.com>
---
 gpsutils/minmea/Makefile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gpsutils/minmea/Makefile b/gpsutils/minmea/Makefile
index 391b54e1f..002950138 100644
--- a/gpsutils/minmea/Makefile
+++ b/gpsutils/minmea/Makefile
@@ -23,17 +23,14 @@ include $(APPDIR)/Make.defs
 MINMEA_URL ?= "https://github.com/kosma/minmea/archive";
 MINMEA_VERSION ?= db46128e73cee26d6a6eb0482dcba544ee1ea9f5
 
-MINMEA_DIR := $(APPDIR)/gpsutils/minmea/minmea
-MINMEA_UNPACKNAME := minmea
-MINMEA_UNPACKDIR := $(MINMEA_DIR)/$(MINMEA_UNPACKNAME)
+MINMEA_UNPACKNAME = minmea
 
-
-$(MINMEA_UNPACKDIR):
+$(MINMEA_UNPACKNAME):
        @echo "Downloading: $(MINMEA_UNPACKNAME)"
        $(Q) curl -O -L $(MINMEA_URL)/$(MINMEA_VERSION).zip
-       $(Q) unzip -o -j $(MINMEA_VERSION).zip
+       $(Q) mkdir $(MINMEA_UNPACKNAME)
+       $(Q) unzip -o -j $(MINMEA_VERSION).zip -d $(MINMEA_UNPACKNAME)
        $(call DELFILE, $(MINMEA_VERSION).zip)
-       $(call MOVEFILE, $(MINMEA_UNPACKNAME)-$(MINMEA_VERSION), 
$(MINMEA_UNPACKDIR))
 
 # Files
 
@@ -45,11 +42,11 @@ clean::
        $(call DELFILE, $(OBJS))
 
 # Download and unpack tarball if no git repo found
-ifeq ($(wildcard $(MINMEA_UNPACKDIR)/.git),)
-context:: $(MINMEA_UNPACKDIR)
+ifeq ($(wildcard $(MINMEA_UNPACKNAME)/.git),)
+context:: $(MINMEA_UNPACKNAME)
 
 distclean::
-       $(call DELDIR, $(MINMEA_UNPACKDIR))
+       $(call DELDIR, $(MINMEA_UNPACKNAME))
 endif
 
 include $(APPDIR)/Application.mk