From 2a7ac6aab48855b4444b7f720e1f5bb8143e36fd Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 25 Dec 2014 16:37:01 -1000 Subject: Fixed typos --- Makefile | 12 ++++++------ nuttx-patches/math.patch | 6 +++--- 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_ - -- cgit v1.2.3