Fix compile errors on hosts with python3 as default

PX4 · Aug 31, 2017 · dd2425b · dd2425b
1 parent 41c153d
commit dd2425b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -254,7 +254,7 @@ endif
 .PHONY:	 upload-usb
 upload-usb: archives all
 	@echo Attempting to flash $(notdir $(LEGACY_PX4)) PX4FLOW board via USB
-	@python -u Tools/px_uploader.py $(LEGACY_PX4) --baud 921600 --port $(SERIAL_PORTS)
+	@python2 -u Tools/px_uploader.py $(LEGACY_PX4) --baud 921600 --port $(SERIAL_PORTS)
 
 
 #

diff --git a/Tools/make_can_boot_descriptor.py b/Tools/make_can_boot_descriptor.py
@@ -258,7 +258,7 @@ def app_descriptor(self, value):
         try:
             options.vcs_commit = int(GitWrapper.command("rev-list HEAD --max-count=1 --abbrev=8 --abbrev-commit"),16)
         except Exception  as e:
-            print "Git Command failed "+ str(e) +"- Exiting!"
+            print("Git Command failed "+ str(e) +"- Exiting!")
             quit()
 
     if args:

diff --git a/makefiles/baremetal/baremetal_px4.mk b/makefiles/baremetal/baremetal_px4.mk
@@ -63,7 +63,7 @@ $(PRODUCT_BIN):		$(PRODUCT_ELF)
 ifdef MKUAVCANBL
 ifdef MAKE_UAVCAN_BOOT_LOADABLE_ID
 	$(info %% Generating UAVCAN Bootable $(MAKE_UAVCAN_BOOT_LOADABLE_ID) as $(IMAGE_DIR)$(MAKE_UAVCAN_BOOT_LOADABLE_ID).$(UAVCAN_BL_EXT))
-	$(Q) python $(MKUAVCANBL)  -v --use-git-hash $@ $(IMAGE_DIR)$(MAKE_UAVCAN_BOOT_LOADABLE_ID).$(UAVCAN_BL_EXT)
+	$(Q) python2 $(MKUAVCANBL)  -v --use-git-hash $@ $(IMAGE_DIR)$(MAKE_UAVCAN_BOOT_LOADABLE_ID).$(UAVCAN_BL_EXT)
 endif
 endif