From 41c6160c4382351c0defd68116d279df70885658 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Tue, 9 Apr 2019 13:17:58 +0100
Subject: [PATCH] ci: Assume SDK has libcapsule-tools-relocatable preinstalled

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 Makefile       |  3 ++-
 ci/Jenkinsfile | 11 +----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 60b68907e..136e2e6e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 VERSION := $(shell ./build-aux/git-version-gen .tarball-version)
+PYTHON ?= python3
 relocatabledir = /usr/lib/libcapsule/relocatable
 
 all: binary
@@ -10,7 +11,7 @@ _relocatabledir =
 endif
 
 install:
-	./build-relocatable-install.py $(_relocatabledir)
+	$(PYTHON) ./build-relocatable-install.py $(_relocatabledir)
 
 check:
 	prove -v t/*.sh
diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
index 55ca1b07c..78373e2c9 100644
--- a/ci/Jenkinsfile
+++ b/ci/Jenkinsfile
@@ -55,16 +55,7 @@ pipeline {
             docker.image("${env.CI_DOCKER_REGISTRY}/steamrt/sdk:scout").inside('--mount type=tmpfs,destination=/var/cache/apt/archives') {
               sh '''
               set -e
-              if [ -d /usr/lib/libcapsule/relocatable ]; then
-                make -C src
-              else
-                apt-get download libcapsule-tools-relocatable:amd64
-                apt-get download libcapsule-tools-relocatable:i386
-                dpkg-deb -x libcapsule-tools-relocatable_*_amd64.deb .
-                dpkg-deb -x libcapsule-tools-relocatable_*_i386.deb .
-
-                make -C src relocatabledir=$(pwd)/usr/lib/libcapsule/relocatable
-              fi
+              make -C src
               '''
             }
           }
-- 
GitLab