ci: Adjust for new EFI build

diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh
index 2c7177b27bb988add0e23db8788e70bf02f6913e..3ec229bd9b7bed551fc3fc63f66df4d4420b9b1b 100755 (executable)
--- a/.github/workflows/build_test.sh
+++ b/.github/workflows/build_test.sh
@@ -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

diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh
index 70ba090eb8e60424bc66b72052356c1b4df4bb64..da99f993f11b2df2aec2246a9879209c3da57564 100755 (executable)
--- a/.github/workflows/unit_tests.sh
+++ b/.github/workflows/unit_tests.sh
@@ -22,6 +22,7 @@ ADDITIONAL_DEPS=(
     perl
     python3-libevdev
     python3-pefile
+    python3-pyelftools
     python3-pyparsing
     rpm
     zstd

diff --git a/mkosi.conf.d/arch/10-arch.conf b/mkosi.conf.d/arch/10-arch.conf
index a1bff7709691258b0110d99e1ce2a37793013473..e1c75b3996f8d36d4a04d463ee0be3a10d9c4f00 100644 (file)
--- a/mkosi.conf.d/arch/10-arch.conf
+++ b/mkosi.conf.d/arch/10-arch.conf
@@ -46,4 +46,5 @@ BuildPackages=
         python-docutils
         python-jinja
         python-lxml
+        python-pyelftools
         python-pytest

diff --git a/mkosi.conf.d/centos/10-centos.conf b/mkosi.conf.d/centos/10-centos.conf
index e19efc7d4ab7476ca57508110093148f1ff81390..606942273f51568a1305ded21ecb903a896b6b7a 100644 (file)
--- a/mkosi.conf.d/centos/10-centos.conf
+++ b/mkosi.conf.d/centos/10-centos.conf
@@ -103,3 +103,4 @@ BuildPackages=
         python3*dist(docutils)
         python3*dist(jinja2)
         python3*dist(lxml)
+        python3*dist(pyelftools)

diff --git a/mkosi.conf.d/debian/10-debian.conf b/mkosi.conf.d/debian/10-debian.conf
index 0712a70bea752059ac839092ea54e3777f3aa920..e9b5775a3733874afd724f398762eafdf52c4c5d 100644 (file)
--- a/mkosi.conf.d/debian/10-debian.conf
+++ b/mkosi.conf.d/debian/10-debian.conf
@@ -91,5 +91,6 @@ BuildPackages=
         python3-docutils
         python3-jinja2
         python3-lxml
+        python3-pyelftools
         python3-pytest
         xsltproc

diff --git a/mkosi.conf.d/fedora/10-fedora.conf b/mkosi.conf.d/fedora/10-fedora.conf
index f3005721214f29dfc3046e3220637d71bebcbf45..b4c641cd67e6f4b210587004f660df18596bfb93 100644 (file)
--- a/mkosi.conf.d/fedora/10-fedora.conf
+++ b/mkosi.conf.d/fedora/10-fedora.conf
@@ -93,4 +93,5 @@ BuildPackages=
         python3dist(docutils)
         python3dist(jinja2)
         python3dist(lxml)
+        python3dist(pyelftools)
         python3dist(pytest)

diff --git a/mkosi.conf.d/opensuse/10-opensuse.conf b/mkosi.conf.d/opensuse/10-opensuse.conf
index 3b0a643efd2649343ea47a97346d18cdf6f5f65c..ae0486850c896f9b49ee28f2b5bbe53831516cf7 100644 (file)
--- a/mkosi.conf.d/opensuse/10-opensuse.conf
+++ b/mkosi.conf.d/opensuse/10-opensuse.conf
@@ -94,6 +94,7 @@ BuildPackages=
         python3-docutils
         python3-Jinja2
         python3-lxml
+        python3-pyelftools
         python3-pytest
         qrencode-devel
         shadow

diff --git a/mkosi.conf.d/ubuntu/10-ubuntu.conf b/mkosi.conf.d/ubuntu/10-ubuntu.conf
index a34fe8d94f8bb2a923216e61ea93e4473db273b9..ffc1d54456239ef545cb12282fdb297bc398552b 100644 (file)
--- a/mkosi.conf.d/ubuntu/10-ubuntu.conf
+++ b/mkosi.conf.d/ubuntu/10-ubuntu.conf
@@ -92,5 +92,6 @@ BuildPackages=
         python3-docutils
         python3-jinja2
         python3-lxml
+        python3-pyelftools
         python3-pytest
         xsltproc

diff --git a/test/meson.build b/test/meson.build
index 9f8a314e82fc94f0285b9a7aa3f614e46c1159f8..1d9ea4905a4b384a5ffab8e05c5bc776459db482 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -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)