diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-11-25 19:14:42 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-07 15:53:47 +0100 |
| commit | 1f6da5d902ef192c7fe24ffd4ebb3b9e1f2ecda8 (patch) | |
| tree | 903249eeaee1829081043bce264c8db6d245e0a7 | |
| parent | man: add man page for ukify (diff) | |
| download | systemd-1f6da5d902ef192c7fe24ffd4ebb3b9e1f2ecda8.tar.xz systemd-1f6da5d902ef192c7fe24ffd4ebb3b9e1f2ecda8.zip | |
ci: install pefile
| -rwxr-xr-x | .github/workflows/build_test.sh | 1 | ||||
| -rwxr-xr-x | .github/workflows/unit_tests.sh | 1 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rwxr-xr-x | src/ukify/test/test_ukify.py | 6 | ||||
| -rwxr-xr-x | src/ukify/ukify.py | 3 |
5 files changed, 11 insertions, 1 deletions
diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 1eed81600c..0d18c6c18b 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -53,6 +53,7 @@ PACKAGES=( python3-evdev python3-jinja2 python3-lxml + python3-pefile python3-pip python3-pyparsing python3-setuptools diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh index 9a9fbb36ab..70ba090eb8 100755 --- a/.github/workflows/unit_tests.sh +++ b/.github/workflows/unit_tests.sh @@ -21,6 +21,7 @@ ADDITIONAL_DEPS=( libzstd-dev perl python3-libevdev + python3-pefile python3-pyparsing rpm zstd @@ -207,6 +207,7 @@ REQUIREMENTS: docbook-xsl (optional, required for documentation) xsltproc (optional, required for documentation) python-jinja2 + python-pefile python-lxml (optional, required to build the indices) python >= 3.5 meson >= 0.53.2 diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py index a4afa56ad9..48ffc6d495 100755 --- a/src/ukify/test/test_ukify.py +++ b/src/ukify/test/test_ukify.py @@ -20,6 +20,12 @@ try: except ImportError: sys.exit(77) +try: + # pyflakes: noqa + import pefile # noqa +except ImportError: + sys.exit(77) + # We import ukify.py, which is a template file. But only __version__ is # substituted, which we don't care about here. Having the .py suffix makes it # easier to import the file. diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py index d4772d2bae..83423fc720 100755 --- a/src/ukify/ukify.py +++ b/src/ukify/ukify.py @@ -20,7 +20,6 @@ import subprocess import tempfile import typing -import pefile __version__ = '{{GIT_VERSION}}' @@ -66,6 +65,8 @@ def shell_join(cmd): def pe_executable_size(filename): + import pefile + pe = pefile.PE(filename) section = pe.sections[-1] return section.VirtualAddress + section.Misc_VirtualSize |