From e15c40b35db97ed19401f334c7b64b0ff09f882a Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Fri, 12 Apr 2013 17:03:32 +0300 Subject: [PATCH 1/3] makefile: deprecate CLEAN_BUILD option (use clean_package or package instead) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 957f7b748..6d6ad4c38 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ SANITIZE_GCC_VARS += CFLAGS CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE $(foreach var, $(SANITIZE_GCC_VARS), $(eval $(call SANITIZE_VAR,$(var),disallowed))) # These specific variables used to be valid but now they make no sense -SANITIZE_DEPRECATED_VARS := USE_BOOTLOADER +SANITIZE_DEPRECATED_VARS := USE_BOOTLOADER CLEAN_BUILD $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),deprecated))) # Make sure this isn't being run as root (no whoami on Windows, but that is ok here) From 9cc0abe2628dacf44830c8c3dfb75bbce62f99ca Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Fri, 12 Apr 2013 17:55:23 +0300 Subject: [PATCH 2/3] makefile: use correct opfw_resource file name as dependancy When 'opfw_resource' target is used as a dependency, it seems that make can't determine when the resource file is remade, and sometimes may start building GCS before the resource really exists. This is an attempt to fix that issue by referencing the real file instead of phony target. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6d6ad4c38..3c0cb974f 100644 --- a/Makefile +++ b/Makefile @@ -757,7 +757,7 @@ $(OPFW_RESOURCE): $(FW_TARGETS) # If opfw_resource or all firmware are requested, GCS should depend on the resource ifneq ($(strip $(filter opfw_resource all all_fw all_flight,$(MAKECMDGOALS))),) - $(eval openpilotgcs: | opfw_resource) + $(eval openpilotgcs: $(OPFW_RESOURCE)) endif # Packaging targets: package, clean_package @@ -780,7 +780,7 @@ ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),) # Packaged GCS should depend on opfw_resource ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),) - $(eval openpilotgcs: | opfw_resource) + $(eval openpilotgcs: $(OPFW_RESOURCE)) endif # Clean the build directory if clean_package is requested From 273d6cb1d21d764c4555f1982306af9b229d4950 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Fri, 12 Apr 2013 20:10:20 +0300 Subject: [PATCH 3/3] OP-892: fix broken op_overo path in .gitmodules The submodule itself was deleted in commit b621b057b60e426ff191f1a983406b9134b514a8 This commit updates the reference, so it can be reenabled if desired. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index cb32dd44f..2ffdf87f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "overo"] path = overo - url = git@github.com:peabody124/op_overo.git + url = gitolite@git.openpilot.org:op_overo.git