From c620c7fc2937d5d054f7ce3130d8d62a37b77424 Mon Sep 17 00:00:00 2001
From: Fredrik Larson <hayvosh@openpilot.org>
Date: Sun, 17 Aug 2014 07:19:29 +1000
Subject: [PATCH 1/5] Change message about installing 7zip on Linux, packaging
 changed in latest LTS

---
 make/tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/tools.mk b/make/tools.mk
index 913b90901..ccf0da3bd 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -422,7 +422,7 @@ define LINUX_QT_INSTALL_TEMPLATE
 
 qt_sdk_install: qt_sdk_clean | $(DL_DIR) $(TOOLS_DIR)
 	$(V1) if ! $(SEVENZIP) >/dev/null 2>&1; then \
-		$(ECHO) $(MSG_NOTICE) "Please install the p7zip for your distribution. i.e.: sudo apt-get install p7zip." && \
+		$(ECHO) $(MSG_NOTICE) "Please install the p7zip for your distribution. i.e.: sudo apt-get install p7zip-full" && \
 		exit 1; \
 	fi
 	$(call DOWNLOAD_TEMPLATE,$(3),$(5),"$(4)")

From bc8ccb7be7f7bc30cf7ff9ad2ee68aee7b8cbef5 Mon Sep 17 00:00:00 2001
From: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat, 16 Aug 2014 23:59:37 +0200
Subject: [PATCH 2/5] Revert "Revert "Merge remote-tracking branch
 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next""

This reverts commit 449653f01e4221f104579d47b25e2b0d9664a890.
---
 ground/openpilotgcs/src/python.pri | 2 +-
 make/tools.mk                      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ground/openpilotgcs/src/python.pri b/ground/openpilotgcs/src/python.pri
index 739fc2cc9..62d03795f 100644
--- a/ground/openpilotgcs/src/python.pri
+++ b/ground/openpilotgcs/src/python.pri
@@ -15,7 +15,7 @@ OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
         PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\"
     } else {
         # not found, hope it's in the path...
-        PYTHON = \"python\"
+        PYTHON = $$(PYTHON)
     }
 }
 
diff --git a/make/tools.mk b/make/tools.mk
index ccf0da3bd..925751d0e 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -690,7 +690,11 @@ ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists)
 else
     # not installed, hope it's in the path...
     # $(info $(EMPTY) WARNING     $(call toprel, $(PYTHON_DIR)) not found, using system PATH)
-    export PYTHON := python
+    ifeq ($(findstring Python 2,$(shell python --version)), Python 2) 
+        export PYTHON := python
+    else
+	export PYTHON := python2
+    endif
 endif
 
 .PHONY: python_version

From 9e8beda778d8ca09acbe6591577dd9d39abb1409 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Sun, 17 Aug 2014 11:08:02 +1200
Subject: [PATCH 3/5] added quotation marks for PYTHON

---
 ground/openpilotgcs/src/python.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ground/openpilotgcs/src/python.pri b/ground/openpilotgcs/src/python.pri
index 62d03795f..3643adc02 100644
--- a/ground/openpilotgcs/src/python.pri
+++ b/ground/openpilotgcs/src/python.pri
@@ -15,7 +15,7 @@ OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
         PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\"
     } else {
         # not found, hope it's in the path...
-        PYTHON = $$(PYTHON)
+        PYTHON = \"$$(PYTHON)\"
     }
 }
 

From f4ddbe53eb7cbe03e85793a063f7a857a4e73777 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Tue, 19 Aug 2014 10:41:24 +1200
Subject: [PATCH 4/5] fixed whitespace

---
 make/tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/tools.mk b/make/tools.mk
index d757091da..8213dee4b 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -597,10 +597,10 @@ ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists)
 else
     # not installed, hope it's in the path...
     # $(info $(EMPTY) WARNING     $(call toprel, $(PYTHON_DIR)) not found, using system PATH)
-    ifeq ($(findstring Python 2,$(shell python --version)), Python 2) 
+    ifeq ($(findstring Python 2,$(shell python --version)), Python 2)
         export PYTHON := python
     else
-	export PYTHON := python2
+        export PYTHON := python2
     endif
 endif
 

From c2af28246f5e7706d37120e24018af356c41ebc1 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Tue, 19 Aug 2014 11:50:03 +1200
Subject: [PATCH 5/5] redirect stderr to stdout for shell python --version

---
 make/tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/tools.mk b/make/tools.mk
index 8213dee4b..ff3e43561 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -597,7 +597,7 @@ ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists)
 else
     # not installed, hope it's in the path...
     # $(info $(EMPTY) WARNING     $(call toprel, $(PYTHON_DIR)) not found, using system PATH)
-    ifeq ($(findstring Python 2,$(shell python --version)), Python 2)
+    ifeq ($(findstring Python 2,$(shell python --version 2>&1)), Python 2)
         export PYTHON := python
     else
         export PYTHON := python2