trivial: debian ci: don't use packaging when subproject active

This prevents carrying hacks in the packaging specific to CI things
that will never actually land in Debian.

This will keep CI availability high while new packages are not yet
actually landed into Debian.
This commit is contained in:
Mario Limonciello 2020-08-28 10:16:38 -05:00 committed by Mario Limonciello
parent c76775641b
commit ac4444b528
2 changed files with 9 additions and 0 deletions

View File

@ -23,6 +23,14 @@ sed s/quilt/native/ debian/source/format -i
#generate control file
./contrib/ci/generate_debian.py
#check if we have all deps available
#if some are missing, we're going to use subproject instead and
#packaging CI will fail
if ! dpkg-checkbuilddeps; then
./contrib/ci/ubuntu.sh
exit 0
fi
#clone test firmware
if [ "$CI_NETWORK" = "true" ]; then
./contrib/ci/get_test_firmware.sh

View File

@ -9,6 +9,7 @@ if [ "$CI_NETWORK" = "true" ]; then
fi
#evaluate using Ubuntu's buildflags
#evaluate using Debian/Ubuntu's buildflags
eval "$(dpkg-buildflags --export=sh)"
#filter out -Bsymbolic-functions
export LDFLAGS=$(dpkg-buildflags --get LDFLAGS | sed "s/-Wl,-Bsymbolic-functions\s//")