Skip to content
Snippets Groups Projects
Commit 41c6160c authored by Simon McVittie's avatar Simon McVittie
Browse files

ci: Assume SDK has libcapsule-tools-relocatable preinstalled

parent 3c016937
No related branches found
No related tags found
No related merge requests found
VERSION := $(shell ./build-aux/git-version-gen .tarball-version) VERSION := $(shell ./build-aux/git-version-gen .tarball-version)
PYTHON ?= python3
relocatabledir = /usr/lib/libcapsule/relocatable relocatabledir = /usr/lib/libcapsule/relocatable
all: binary all: binary
...@@ -10,7 +11,7 @@ _relocatabledir = ...@@ -10,7 +11,7 @@ _relocatabledir =
endif endif
install: install:
./build-relocatable-install.py $(_relocatabledir) $(PYTHON) ./build-relocatable-install.py $(_relocatabledir)
check: check:
prove -v t/*.sh prove -v t/*.sh
......
...@@ -55,16 +55,7 @@ pipeline { ...@@ -55,16 +55,7 @@ pipeline {
docker.image("${env.CI_DOCKER_REGISTRY}/steamrt/sdk:scout").inside('--mount type=tmpfs,destination=/var/cache/apt/archives') { docker.image("${env.CI_DOCKER_REGISTRY}/steamrt/sdk:scout").inside('--mount type=tmpfs,destination=/var/cache/apt/archives') {
sh ''' sh '''
set -e set -e
if [ -d /usr/lib/libcapsule/relocatable ]; then make -C src
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
''' '''
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment