From f0896ca55781c842996b018b35ba63917d8af444 Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Tue, 26 Mar 2024 16:08:57 +0100 Subject: [PATCH] efi: skip check-alignment-* tests if pefile is not installed Otherwise, when building with ukify disabled, no one else requires pefile, and if it is not installed, those tests fail: ``` ================================== 12/1212 =================================== test: systemd:efi / check-alignment-systemd-bootx64.efi start time: 14:21:54 duration: 0.08s result: exit status 1 command: /mnt/work/systemd/upstream-fork/main/tools/check-efi-alignment.py /mnt/work/systemd/upstream-fork/main/build/src/boot/efi/systemd-bootx64.efi ----------------------------------- stderr ----------------------------------- Traceback (most recent call last): File "/mnt/work/systemd/upstream-fork/main/tools/check-efi-alignment.py", line 7, in import pefile ModuleNotFoundError: No module named 'pefile' ============================================================================== ================================== 13/1212 =================================== test: systemd:efi / check-alignment-linuxx64.efi.stub start time: 14:21:54 duration: 0.08s result: exit status 1 command: /mnt/work/systemd/upstream-fork/main/tools/check-efi-alignment.py /mnt/work/systemd/upstream-fork/main/build/src/boot/efi/linuxx64.efi.stub ----------------------------------- stderr ----------------------------------- Traceback (most recent call last): File "/mnt/work/systemd/upstream-fork/main/tools/check-efi-alignment.py", line 7, in import pefile ModuleNotFoundError: No module named 'pefile' ============================================================================== ================================== 14/1212 =================================== test: systemd:efi / check-alignment-addonx64.efi.stub start time: 14:21:54 duration: 0.07s result: exit status 1 command: /mnt/work/systemd/upstream-fork/main/tools/check-efi-alignment.py /mnt/work/systemd/upstream-fork/main/build/src/boot/efi/addonx64.efi.stub ----------------------------------- stderr ----------------------------------- Traceback (most recent call last): File "/mnt/work/systemd/upstream-fork/main/tools/check-efi-alignment.py", line 7, in import pefile ModuleNotFoundError: No module named 'pefile' ============================================================================== ``` Follow-up for 7ff3b88396f440bff60328b4bff7627a34d45e4a --- tools/check-efi-alignment.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/check-efi-alignment.py b/tools/check-efi-alignment.py index bb33ac08097..26d5f5e40d8 100755 --- a/tools/check-efi-alignment.py +++ b/tools/check-efi-alignment.py @@ -4,7 +4,11 @@ import sys -import pefile +try: + import pefile +except ImportError as e: + print(str(e), file=sys.stderr) + sys.exit(77) def main(): -- 2.47.3