sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpusutils/minmea: Fix build break by wrong unpack path

Browse Source 
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 <huangqi3@xiaomi.com>
This commit is contained in:
Huang Qi 2022-08-29 04:49:24 +00:00 committed by Xiang Xiao
parent 65b58724ca
commit 1e4165220e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gpsutils/minmea/Makefile
View File

@ -23,17 +23,14 @@ include $(APPDIR)/Make.defs
MINMEA_URL ?= "https://github.com/kosma/minmea/archive" MINMEA_URL ?= "https://github.com/kosma/minmea/archive"
MINMEA_VERSION ?= db46128e73cee26d6a6eb0482dcba544ee1ea9f5 MINMEA_VERSION ?= db46128e73cee26d6a6eb0482dcba544ee1ea9f5
MINMEA_DIR := $(APPDIR)/gpsutils/minmea/minmea MINMEA_UNPACKNAME = minmea
MINMEA_UNPACKNAME := minmea
MINMEA_UNPACKDIR := $(MINMEA_DIR)/$(MINMEA_UNPACKNAME)
$(MINMEA_UNPACKNAME):
$(MINMEA_UNPACKDIR):
@echo "Downloading: $(MINMEA_UNPACKNAME)" @echo "Downloading: $(MINMEA_UNPACKNAME)"
$(Q) curl -O -L $(MINMEA_URL)/$(MINMEA_VERSION).zip $(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 DELFILE, $(MINMEA_VERSION).zip)
$(call MOVEFILE, $(MINMEA_UNPACKNAME)-$(MINMEA_VERSION), $(MINMEA_UNPACKDIR))
# Files # Files
@ -45,11 +42,11 @@ clean::
$(call DELFILE, $(OBJS)) $(call DELFILE, $(OBJS))
# Download and unpack tarball if no git repo found # Download and unpack tarball if no git repo found
ifeq ($(wildcard $(MINMEA_UNPACKDIR)/.git),) ifeq ($(wildcard $(MINMEA_UNPACKNAME)/.git),)
context:: $(MINMEA_UNPACKDIR) context:: $(MINMEA_UNPACKNAME)
distclean:: distclean::
$(call DELDIR, $(MINMEA_UNPACKDIR)) $(call DELDIR, $(MINMEA_UNPACKNAME))
endif endif
include $(APPDIR)/Application.mk include $(APPDIR)/Application.mk