Skip to content

Commit 0c59320

Browse files
committed
Changed both sbuildrc and deb-build.sh to use --build-dep-resolver=apt instead of aptitude. The apt resolver is simpler and doesn't require installing aptitude in the chroot, but with --resolve-alternatives
it should still handle the build profile alternatives correctly.
1 parent 9251f09 commit 0c59320

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

resources/deb-build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,24 @@ if [[ "${ARCH}" != "amd64" ]]; then
7979
if [[ "${ARCH}" == "arm64" || "${ARCH}" == "ppc64el" ]]; then
8080
if ubuntu-distro-info --all | grep -Fqxi "${DIST}"; then
8181
sbuild --dist "${DIST}" --no-arch-all --host "${ARCH}" --build=amd64 --no-apt-distupgrade \
82-
--build-dep-resolver=aptitude --resolve-alternatives \
82+
--build-dep-resolver=apt --resolve-alternatives \
8383
--extra-repository='deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports '"${DIST}"' main universe' \
8484
--extra-repository='deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports '"${DIST}"'-updates main universe' \
8585
"${PROJECT_DIR}"/../libjitsi_*.dsc
8686
elif debian-distro-info --all | grep -Fqxi "${DIST}"; then
8787
sbuild --dist "${DIST}" --no-arch-all --host "${ARCH}" --build=amd64 --no-apt-distupgrade \
88-
--build-dep-resolver=aptitude --resolve-alternatives \
88+
--build-dep-resolver=apt --resolve-alternatives \
8989
--extra-repository='deb [arch=arm64,ppc64el] http://deb.debian.org/debian '"${DIST}"' main' \
9090
--extra-repository='deb [arch=arm64,ppc64el] http://deb.debian.org/debian '"${DIST}"'-updates main' \
9191
"${PROJECT_DIR}"/../libjitsi_*.dsc
9292
else
9393
sbuild --dist "${DIST}" --no-arch-all --host "${ARCH}" --build=amd64 --no-apt-distupgrade \
94-
--build-dep-resolver=aptitude --resolve-alternatives \
94+
--build-dep-resolver=apt --resolve-alternatives \
9595
"${PROJECT_DIR}"/../libjitsi_*.dsc
9696
fi
9797
else
9898
sbuild --dist "${DIST}" --no-arch-all --host "${ARCH}" --build=amd64 --no-apt-distupgrade \
99-
--build-dep-resolver=aptitude --resolve-alternatives \
99+
--build-dep-resolver=apt --resolve-alternatives \
100100
"${PROJECT_DIR}"/../libjitsi_*.dsc
101101
fi
102102
else

resources/sbuildrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $build_dir = $ENV{'BUILD_DIR'};
44
$run_lintian = 0;
55
$apt_update = 1;
66
$apt_distupgrade = 0;
7-
$build_dep_resolver = 'aptitude';
7+
$build_dep_resolver = 'apt';
88
$resolve_alternatives = 1;
99
$mailto = '';
1010
$mailprog = '';

0 commit comments

Comments
 (0)