diff --git a/Makefile b/Makefile index 60b68907e60725246cecafda343f6ad431526af7..136e2e6e74c1bee4c1746181cf5215701da7282e 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 55ca1b07c3d043834f967afad06e2648fcf7c4fc..78373e2c9016170a982e5d4f0dd62d6754cf1775 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 ''' } }