aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sidrane <david_s5@nscdg.com>2014-12-25 16:37:01 -1000
committerDavid Sidrane <david_s5@nscdg.com>2015-04-07 07:49:05 -1000
commit2a7ac6aab48855b4444b7f720e1f5bb8143e36fd (patch)
treea13093bd38a279df7510ef6acc90269f6fe60b12
parentc1aec01a3f6d88e4a3226ec3bcb5ec3dc9cb5635 (diff)
downloadpx4-firmware-2a7ac6aab48855b4444b7f720e1f5bb8143e36fd.tar.gz
px4-firmware-2a7ac6aab48855b4444b7f720e1f5bb8143e36fd.tar.bz2
px4-firmware-2a7ac6aab48855b4444b7f720e1f5bb8143e36fd.zip
Fixed typos
-rw-r--r--Makefile12
-rw-r--r--nuttx-patches/math.patch6
2 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 23fbf8f08..1f273aa88 100644
--- a/Makefile
+++ b/Makefile
@@ -190,23 +190,23 @@ NUTTX_PATCHED = $(NUTTX_SRC).patchedpx4common
.PHONY: nuttxpatches
nuttxpatches:
- $(Q) if [ ! -f $(NUTTX_PATCHED) ]; then \
+ $(Q) -if [ ! -f $(NUTTX_PATCHED) ]; then \
for patch in $(NUTTX_PATCHES); \
do \
- $(PATCH) -p0 -N < $$patch; \
+ $(PATCH) -p0 -N -R < $$patch >/dev/null; \
done \
fi
$(Q) $(TOUCH) $(NUTTX_PATCHED)
.PHONY: cleannuttxpatches
cleannuttxpatches:
- $(Q) if [ ! -f $(NUTTX_PATCHED) ]; then \
+ $(Q) -if [ -f $(NUTTX_PATCHED) ]; then \
for patch in $(NUTTX_PATCHES); \
do \
- $(PATCH) -p0 -N -R < $$patch; \
+ $(PATCH) -p0 -N < $$patch >/dev/null; \
done \
fi
- $(Q) $(TOUCH) $(NUTTX_PATCHED)
+ $(Q) $(REMOVE) $(NUTTX_PATCHED)
#
# The user can run the NuttX 'menuconfig' tool for a single board configuration with
@@ -301,7 +301,7 @@ clean:
$(Q) $(REMOVE) $(IMAGE_DIR)*.px4
.PHONY: distclean
-distclean: clean cleannuttxpatches
+distclean: cleannuttxpatches clean
@echo > /dev/null
$(Q) $(REMOVE) $(ARCHIVE_DIR)*.export > /dev/null
$(Q) $(MAKE) -C $(NUTTX_SRC) -r $(MQUIET) distclean > /dev/null
diff --git a/nuttx-patches/math.patch b/nuttx-patches/math.patch
index 6b60e2cae..a93b2daf6 100644
--- a/nuttx-patches/math.patch
+++ b/nuttx-patches/math.patch
@@ -1,6 +1,6 @@
-diff -ruN NuttX/nuttx/arch/arm/include/m.math,h /tmp/NuttX/nuttx/arch/arm/include/m.math,h
---- NuttX/nuttx/arch/arm/include/m.math,h 2014-12-25 06:02:40.565856919 -1000
-+++ NuttX/nuttx/arch/arm/include/m.math,h 1969-12-31 14:00:00.000000000 -1000
+diff -ruN NuttX/nuttx/arch/arm/include/math.h NuttX/nuttx/arch/arm/include/math.h
+--- NuttX/nuttx/arch/arm/include/math.h 2014-12-25 06:02:40.565856919 -1000
++++ NuttX/nuttx/arch/arm/include/math.h 1969-12-31 14:00:00.000000000 -1000
@@ -1,585 +0,0 @@
-#ifndef _MATH_H_
-