Skip to content

Commit 59de261

Browse files
committed
spread: simplify build-dep install
1 parent e5af556 commit 59de261

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

spread/build/ubuntu/task.yaml

+2-11
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,16 @@ summary: Build Ubuntu packages
1212
execute: |
1313
cd $SPREAD_PATH
1414
15-
apt-get install --yes software-properties-common
16-
1715
# Add Mir dev PPA for any out-of-archive packages needed
1816
# (Currently: a newer version of WLCS)
1917
add-apt-repository ppa:mir-team/dev
2018
2119
# to get dpkg-architecture and mk-build-deps
2220
apt-get install \
2321
--yes \
24-
--no-install-recommends \
2522
ccache \
2623
devscripts \
27-
dpkg-dev \
28-
equivs
24+
dpkg-dev
2925
3026
# set host and build environment up
3127
source <( dpkg-architecture --print-set --host-arch ${ARCH} )
@@ -56,18 +52,13 @@ execute: |
5652
5753
apt-get update
5854
apt-get --yes install qemu-user-static binfmt-support
59-
60-
# Quirk for the eglexternalplatform-dev build dependency
61-
sed -i 's/\(eglexternalplatform-dev\)/\1:all/' debian/control
6255
fi
6356
6457
# Mark the "release" in the changelog
6558
debchange --release "CI release"
6659
6760
# install dependencies
68-
mk-build-deps \
69-
--install \
70-
--tool "apt-get --yes -o Debug::pkgProblemResolver=yes -o APT::Immediate-Configure=0"
61+
apt-get build-dep --yes ./
7162
7263
# use clang
7364
if [ "${CLANG}" -eq 1 ]; then

0 commit comments

Comments
 (0)