diff -Naurb OpenPilot.ORIG/Makefile OpenPilot/Makefile --- OpenPilot.ORIG/Makefile 2011-10-20 20:23:02.000000000 +1100 +++ OpenPilot/Makefile 2011-10-21 00:59:00.000000000 +1100 @@ -312,7 +312,7 @@ $(MAKE) --no-print-directory -w ; \ ) -UAVOBJ_TARGETS := gcs flight python matlab java +UAVOBJ_TARGETS := gcs flight python2 matlab java .PHONY:uavobjects uavobjects: $(addprefix uavobjects_, $(UAVOBJ_TARGETS)) diff -Naurb OpenPilot.ORIG/flight/CopterControl/Makefile OpenPilot/flight/CopterControl/Makefile --- OpenPilot.ORIG/flight/CopterControl/Makefile 2011-10-20 20:23:04.000000000 +1100 +++ OpenPilot/flight/CopterControl/Makefile 2011-10-21 00:59:00.000000000 +1100 @@ -471,7 +471,7 @@ # Define programs and commands. REMOVE = $(REMOVE_CMD) -f -PYTHON = python +PYTHON = python2 # List of all source files. ALLSRC = $(ASRCARM) $(ASRC) $(SRCARM) $(SRC) $(CPPSRCARM) $(CPPSRC) diff -Naurb OpenPilot.ORIG/flight/OpenPilot/Makefile OpenPilot/flight/OpenPilot/Makefile --- OpenPilot.ORIG/flight/OpenPilot/Makefile 2011-10-20 20:23:05.000000000 +1100 +++ OpenPilot/flight/OpenPilot/Makefile 2011-10-21 00:59:00.000000000 +1100 @@ -436,7 +436,7 @@ # Define programs and commands. REMOVE = $(REMOVE_CMD) -f -PYTHON = python +PYTHON = python2 # List of all source files. ALLSRC = $(ASRCARM) $(ASRC) $(SRCARM) $(SRC) $(CPPSRCARM) $(CPPSRC) diff -Naurb OpenPilot.ORIG/flight/OpenPilot/Makefile.posix OpenPilot/flight/OpenPilot/Makefile.posix --- OpenPilot.ORIG/flight/OpenPilot/Makefile.posix 2011-10-20 20:23:05.000000000 +1100 +++ OpenPilot/flight/OpenPilot/Makefile.posix 2011-10-21 01:03:34.000000000 +1100 @@ -360,7 +360,7 @@ SIZE = $(TCHAIN_PREFIX)size NM = $(TCHAIN_PREFIX)nm REMOVE = $(REMOVE_CMD) -f -PYTHON = python +PYTHON = python2 ###SHELL = sh ###COPY = cp diff -Naurb OpenPilot.ORIG/flight/OpenPilot/Makefile.win32 OpenPilot/flight/OpenPilot/Makefile.win32 --- OpenPilot.ORIG/flight/OpenPilot/Makefile.win32 2011-10-20 20:23:05.000000000 +1100 +++ OpenPilot/flight/OpenPilot/Makefile.win32 2011-10-21 01:03:37.000000000 +1100 @@ -345,7 +345,7 @@ SIZE = size NM = nm REMOVE = $(REMOVE_CMD) -f -PYTHON = python +PYTHON = python2 ###SHELL = sh ###COPY = cp diff -Naurb OpenPilot.ORIG/ground/openpilotgcs/src/plugins/coreplugin/gcsversioninfo.pri OpenPilot/ground/openpilotgcs/src/plugins/coreplugin/gcsversioninfo.pri --- OpenPilot.ORIG/ground/openpilotgcs/src/plugins/coreplugin/gcsversioninfo.pri 2011-10-20 20:23:14.000000000 +1100 +++ OpenPilot/ground/openpilotgcs/src/plugins/coreplugin/gcsversioninfo.pri 2011-10-21 01:01:24.000000000 +1100 @@ -11,7 +11,7 @@ VERSION_INFO_HEADER = $$GCS_BUILD_TREE/gcsversioninfo.h VERSION_INFO_SCRIPT = $$ROOT_DIR/make/scripts/version-info.py VERSION_INFO_TEMPLATE = $$ROOT_DIR/make/templates/gcsversioninfotemplate.h - VERSION_INFO_COMMAND = python \"$$VERSION_INFO_SCRIPT\" + VERSION_INFO_COMMAND = python2 \"$$VERSION_INFO_SCRIPT\" # Create custom version_info target which generates a header version_info.target = $$VERSION_INFO_HEADER diff -Naurb OpenPilot.ORIG/make/firmware-defs.mk OpenPilot/make/firmware-defs.mk --- OpenPilot.ORIG/make/firmware-defs.mk 2011-10-20 20:23:16.000000000 +1100 +++ OpenPilot/make/firmware-defs.mk 2011-10-21 01:01:36.000000000 +1100 @@ -116,7 +116,7 @@ $(1).firmwareinfo.c: $(1) $(TOP)/make/templates/firmwareinfotemplate.c FORCE @echo $(MSG_FWINFO) $$(call toprel, $$@) - $(V1) python $(TOP)/make/scripts/version-info.py \ + $(V1) python2 $(TOP)/make/scripts/version-info.py \ --path=$(TOP) \ --template=$(TOP)/make/templates/firmwareinfotemplate.c \ --outfile=$$@ \ diff -Naurb OpenPilot.ORIG/package/Makefile OpenPilot/package/Makefile --- OpenPilot.ORIG/package/Makefile 2011-10-20 20:23:16.000000000 +1100 +++ OpenPilot/package/Makefile 2011-10-21 00:59:00.000000000 +1100 @@ -13,7 +13,7 @@ # Set up some macros BUILD_DIR := $(ROOT_DIR)/build -VERSION_CMD := python $(ROOT_DIR)/make/scripts/version-info.py --path="$(ROOT_DIR)" +VERSION_CMD := python2 $(ROOT_DIR)/make/scripts/version-info.py --path="$(ROOT_DIR)" PACKAGE_LBL := $(shell $(VERSION_CMD) --format=\$${DATE}-\$${TAG_OR_HASH8}\$${DIRTY}) PACKAGE_DIR := $(BUILD_DIR)/package-$(PACKAGE_LBL) FW_DIR := $(PACKAGE_DIR)/firmware-$(PACKAGE_LBL)