Skip to content

Commit c41ac81

Browse files
committed
fix: Using aspcud instead of apt/dose for dependency resolution
1 parent 3e784f7 commit c41ac81

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

resources/deb-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ mvn -B versions:set -DnewVersion="${VERSION}" -DgenerateBackupPoms=false
4444
"${PROJECT_DIR}/resources/deb-gen-source.sh" "${VERSION}" "${DIST}"
4545
export SBUILD_CONFIG="${PROJECT_DIR}/resources/sbuildrc"
4646
if [[ "${ARCH}" != "amd64" ]]; then
47-
sbuild --dist "${DIST}" --no-arch-all --host "${ARCH}" "${PROJECT_DIR}"/../libjitsi_*.dsc
47+
sbuild --dist "${DIST}" --no-arch-all --host "${ARCH}" --build=amd64 --resolve-alternatives "${PROJECT_DIR}"/../libjitsi_*.dsc
4848
else
4949
sbuild --dist "${DIST}" --arch-all "${PROJECT_DIR}"/../libjitsi_*.dsc
5050
cp "${PROJECT_DIR}"/../libjitsi_* "$BUILD_DIR"

resources/deb-prepare.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ sudo apt-get install -y \
2727
debhelper \
2828
sbuild \
2929
schroot \
30+
aspcud \
3031
"$DEVTOOLS_PACKAGE" \
3132
"$UBUNTUTOOLS_PACKAGE" \
3233
debian-archive-keyring \

resources/sbuildrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ $build_dir = $ENV{'BUILD_DIR'};
44
$run_lintian = 0;
55
$apt_update = 1;
66
$apt_distupgrade = 1;
7-
$build_dep_resolver = 'apt';
7+
$build_dep_resolver = 'aspcud';
8+
$resolve_alternatives = 1;
89
$mailto = '';
910
$mailprog = '';
1011

0 commit comments

Comments
 (0)