From 11bb1098a39c905b3ac54fe5b657d31d0b56f2a1 Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Thu, 20 Aug 2020 16:59:26 +0200
Subject: [PATCH] Fix finalise tinyipa

The version of pip should be the same between build and finalise
otherwise installing from wheels will likely fail.

Depends-On: https://review.opendev.org/747355

Change-Id: I575b7294e21a9a9ebe34181171d065c31aa13e34
---
 tinyipa/finalise-tinyipa.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tinyipa/finalise-tinyipa.sh b/tinyipa/finalise-tinyipa.sh
index 37d40b4..4894d84 100755
--- a/tinyipa/finalise-tinyipa.sh
+++ b/tinyipa/finalise-tinyipa.sh
@@ -157,7 +157,10 @@ if [[ $USE_PYTHON3 == "True" ]]; then
 fi
 
 # Install pip
-$CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip --upgrade
+# NOTE(rpittau): pip MUST be the same version used in the build script or
+# dragons will appear and put everything on fire
+$CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip
+$CHROOT_CMD ${PIP_COMMAND} install --upgrade pip wheel
 
 # If flag is set install python now
 if $BUILD_AND_INSTALL_TINYIPA ; then