From d9fbde7cc70c9cb76694989f7c29e9535a48d687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sat, 8 Oct 2022 18:21:59 +0100 Subject: [PATCH] Debian: Ignore symbol changes on the master branch Fixes #18404. --- .gitlab-ci.yml | 4 ++++ packaging/debian/rules | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed9ceb52f3b..6c6a7fe4925 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,6 +214,8 @@ Debian Stable APT Package: - export DEB_BUILD_OPTIONS="nocheck parallel=$(( $(getconf _NPROCESSORS_ONLN) + 2 ))" - export DH_QUIET=1 - export MAKEFLAGS=--silent + # Ignore changed symbols (on development branch). + - export DPKG_GENSYMBOLS_CHECK_LEVEL=0 - CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ dpkg-buildpackage -b --no-sign -jauto -zfast - lintian --suppress-tags library-not-linked-against-libc,copyright-excludes-files-in-native-package --display-experimental --display-info --pedantic --profile debian - mkdir debian-packages @@ -296,6 +298,8 @@ Ubuntu APT Package: # build-ubuntu puts us in `build`. - cd .. - ln --symbolic --no-dereference --force packaging/debian + # Ignore changed symbols (on development branch). + - export DPKG_GENSYMBOLS_CHECK_LEVEL=0 - CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ MAKE=ninja dpkg-buildpackage -us -uc -rfakeroot -jauto -zfast - mkdir ubuntu-packages - mv ../*.deb ubuntu-packages/ diff --git a/packaging/debian/rules b/packaging/debian/rules index 6d7400ce6bb..053340c187e 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -7,9 +7,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# Catch symbol additions. -export DPKG_GENSYMBOLS_CHECK_LEVEL=4 - distrelease := $(shell lsb_release -cs) ifeq ($(distrelease),n/a) distrelease := sid