ci: Adjust for new EFI build

This commit is contained in:
Jan Janssen 2023-03-02 15:41:17 +01:00
parent 31ffb6b183
commit e8509329d7
9 changed files with 12 additions and 5 deletions

View file

@ -9,7 +9,7 @@ success() { echo >&2 -e "\033[32;1m$1\033[0m"; }
ARGS=(
"--optimization=0"
"--optimization=s -Dbootloader=true -Defi-cflags=-m32"
"--optimization=s"
"--optimization=3 -Db_lto=true -Ddns-over-tls=false"
"--optimization=3 -Db_lto=false"
"--optimization=3 -Ddns-over-tls=openssl"
@ -27,7 +27,6 @@ PACKAGES=(
kbd
libblkid-dev
libbpf-dev
libc6-dev-i386
libcap-dev
libcurl4-gnutls-dev
libfdisk-dev
@ -55,6 +54,7 @@ PACKAGES=(
python3-lxml
python3-pefile
python3-pip
python3-pyelftools
python3-pyparsing
python3-setuptools
quota
@ -156,8 +156,8 @@ for args in "${ARGS[@]}"; do
fatal "'meson compile' failed with '$args'"
fi
for loader in build/src/boot/efi/*.efi; do
if sbverify --list "$loader" |& grep -q "gap in section table"; then
for loader in build/src/boot/efi/*{.efi,.efi.stub}; do
if [[ "$(sbverify --list "$loader" 2>&1)" != "No signature table present" ]]; then
fatal "$loader: Gaps found in section table"
fi
done

View file

@ -22,6 +22,7 @@ ADDITIONAL_DEPS=(
perl
python3-libevdev
python3-pefile
python3-pyelftools
python3-pyparsing
rpm
zstd

View file

@ -46,4 +46,5 @@ BuildPackages=
python-docutils
python-jinja
python-lxml
python-pyelftools
python-pytest

View file

@ -103,3 +103,4 @@ BuildPackages=
python3*dist(docutils)
python3*dist(jinja2)
python3*dist(lxml)
python3*dist(pyelftools)

View file

@ -91,5 +91,6 @@ BuildPackages=
python3-docutils
python3-jinja2
python3-lxml
python3-pyelftools
python3-pytest
xsltproc

View file

@ -93,4 +93,5 @@ BuildPackages=
python3dist(docutils)
python3dist(jinja2)
python3dist(lxml)
python3dist(pyelftools)
python3dist(pytest)

View file

@ -94,6 +94,7 @@ BuildPackages=
python3-docutils
python3-Jinja2
python3-lxml
python3-pyelftools
python3-pytest
qrencode-devel
shadow

View file

@ -92,5 +92,6 @@ BuildPackages=
python3-docutils
python3-jinja2
python3-lxml
python3-pyelftools
python3-pytest
xsltproc

View file

@ -73,7 +73,7 @@ if install_tests
'../-.mount',
testsuite08_dir + '/local-fs.target.wants/-.mount')
if conf.get('ENABLE_BOOTLOADER') == 1 and conf.get('HAVE_ZSTD') == 1
if conf.get('HAVE_ZSTD') == 1 and efi_arch != ''
install_subdir('test-bcd',
exclude_files : '.gitattributes',
install_dir : testdata_dir)