From: Maria Matejka Date: Fri, 27 Mar 2026 10:40:08 +0000 (+0100) Subject: CI: Ignore THP disable warning for crossbuilds X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd08d856cd9bdba38659aedbe500fbd2f1a6d677;p=thirdparty%2Fbird.git CI: Ignore THP disable warning for crossbuilds Crossbuilds are run in qemu-user which doesn't support disabling transparent huge pages. --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3978e953d..c61b754dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -880,7 +880,7 @@ docker-ubuntu-25.10-amd64: # Build docs when tools are available - if which linuxdoc pdflatex sgmlsasp >/dev/null ; then $MAKE docs ; fi # Check that the reported version is the right one - - ${CROSS_RUN} ./bird --version |& tee obj/version-built + - ${CROSS_RUN} ./bird --version |& grep -v 'Cannot disable transparent huge pages' | tee obj/version-built - diff obj/version-built version-expected .build-docker-linux-amd64: &build-docker-linux-amd64 diff --git a/gitlab/template.yml.j2 b/gitlab/template.yml.j2 index aeaf8079d..ee078a818 100644 --- a/gitlab/template.yml.j2 +++ b/gitlab/template.yml.j2 @@ -345,7 +345,7 @@ docker-{{ docker["name"] }}: # Build docs when tools are available - if which linuxdoc pdflatex sgmlsasp >/dev/null ; then $MAKE docs ; fi # Check that the reported version is the right one - - ${CROSS_RUN} ./bird --version |& tee obj/version-built + - ${CROSS_RUN} ./bird --version |& grep -v 'Cannot disable transparent huge pages' | tee obj/version-built - diff obj/version-built version-expected .build-docker-linux-amd64: &build-docker-linux-amd64