diff options
| author | Jan Janssen <medhefgo@web.de> | 2023-03-02 15:41:17 +0100 |
|---|---|---|
| committer | Jan Janssen <medhefgo@web.de> | 2023-03-10 11:41:08 +0100 |
| commit | e8509329d769d698ae7208ebf673822146c50d8d (patch) | |
| tree | a84dabd91d56c08037a7859e4adc35432ba19e29 /.github | |
| parent | 31ffb6b183bafb4c005ba86bf10f961e07e42e0c (diff) | |
| download | systemd-e8509329d769d698ae7208ebf673822146c50d8d.tar.gz | |
ci: Adjust for new EFI build
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/workflows/build_test.sh | 8 | ||||
| -rwxr-xr-x | .github/workflows/unit_tests.sh | 1 |
2 files changed, 5 insertions, 4 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 |