diff options
| -rwxr-xr-x | .github/workflows/build_test.sh | 8 | ||||
| -rwxr-xr-x | .github/workflows/unit_tests.sh | 1 | ||||
| -rw-r--r-- | mkosi.conf.d/arch/10-arch.conf | 1 | ||||
| -rw-r--r-- | mkosi.conf.d/centos/10-centos.conf | 1 | ||||
| -rw-r--r-- | mkosi.conf.d/debian/10-debian.conf | 1 | ||||
| -rw-r--r-- | mkosi.conf.d/fedora/10-fedora.conf | 1 | ||||
| -rw-r--r-- | mkosi.conf.d/opensuse/10-opensuse.conf | 1 | ||||
| -rw-r--r-- | mkosi.conf.d/ubuntu/10-ubuntu.conf | 1 | ||||
| -rw-r--r-- | test/meson.build | 2 |
9 files changed, 12 insertions, 5 deletions
diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 2c7177b27b..3ec229bd9b 100755 --- 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 70ba090eb8..da99f993f1 100755 --- 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 a1bff77096..e1c75b3996 100644 --- 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 e19efc7d4a..606942273f 100644 --- 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 0712a70bea..e9b5775a37 100644 --- 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 f300572121..b4c641cd67 100644 --- 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 3b0a643efd..ae0486850c 100644 --- 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 a34fe8d94f..ffc1d54456 100644 --- 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 9f8a314e82..1d9ea4905a 100644 --- 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) |