From 9eceb20b08edee014636d13577676a5748b5c850 Mon Sep 17 00:00:00 2001 From: Fish Date: Wed, 24 Jun 2026 16:56:20 -0700 Subject: [PATCH 1/2] Revert "Vendor uefi-firmware as a submodule. (#690)" This reverts commit 944c87a74b23308be66c94e657cbb790dd036de4. --- .github/workflows/ci.yml | 1 - .gitmodules | 3 --- .readthedocs.yml | 3 --- deps/uefi-firmware | 1 - pyproject.toml | 24 +----------------------- tests/test_clemory.py | 4 +--- 6 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 .gitmodules delete mode 160000 deps/uefi-firmware diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1945951..81e6c491 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,6 @@ jobs: - uses: actions/checkout@v6 with: path: cle - submodules: recursive - uses: actions/checkout@v6 with: repository: angr/binaries diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 76ecbfa7..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "deps/uefi-firmware"] - path = deps/uefi-firmware - url = https://github.com/theopolis/uefi-firmware-parser.git diff --git a/.readthedocs.yml b/.readthedocs.yml index 21fec622..f18d4fa8 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -2,9 +2,6 @@ # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details version: 2 -submodules: - include: all - recursive: true sphinx: configuration: docs/conf.py formats: [pdf] diff --git a/deps/uefi-firmware b/deps/uefi-firmware deleted file mode 160000 index bf3dfaa8..00000000 --- a/deps/uefi-firmware +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bf3dfaa8a05675bae6ea0cbfa082ddcebfcde23e diff --git a/pyproject.toml b/pyproject.toml index 6e94e60c..7871edcb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,6 +27,7 @@ dependencies = [ "pyxbe~=1.0.3", "pyxdia~=0.1", "sortedcontainers>=2.0", + "uefi-firmware>=1.10", ] [project.readme] @@ -60,29 +61,6 @@ testing = [ [tool.setuptools] include-package-data = true -[tool.setuptools.packages.find] -where = [".", "deps/uefi-firmware"] -include = ["cle*", "uefi_firmware*"] - -[[tool.setuptools.ext-modules]] -name = "uefi_firmware.efi_compressor" -include-dirs = ["deps/uefi-firmware/uefi_firmware/compression/Include"] -sources = [ - "deps/uefi-firmware/uefi_firmware/compression/EfiCompressor.c", - "deps/uefi-firmware/uefi_firmware/compression/LZMA/LzmaCompress.c", - "deps/uefi-firmware/uefi_firmware/compression/LZMA/LzmaDecompress.c", - "deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/Bra.c", - "deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/Bra86.c", - "deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/CpuArch.c", - "deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/LzFind.c", - "deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/LzmaDec.c", - "deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/LzmaEnc.c", - "deps/uefi-firmware/uefi_firmware/compression/Tiano/Decompress.c", - "deps/uefi-firmware/uefi_firmware/compression/Tiano/EfiCompress.c", - "deps/uefi-firmware/uefi_firmware/compression/Tiano/TianoCompress.c", -] -py-limited-api=true - [tool.setuptools.dynamic] version = { attr = "cle.__version__" } diff --git a/tests/test_clemory.py b/tests/test_clemory.py index eae1792b..e47bd421 100644 --- a/tests/test_clemory.py +++ b/tests/test_clemory.py @@ -7,10 +7,8 @@ import cle -def disabled_test_cclemory(): # pylint: disable=no-member +def test_cclemory(): # pylint: disable=no-member # This is a test case for C-backed Clemory. - # Fish disabled this test case until the bug in py-cffi is fixed: - # https://github.com/python-cffi/cffi/issues/246 clemory = cle.Clemory(None, root=True) clemory.add_backer(0, b"\x90" * 1000) From f4cb85e0f37e2641a41375b5fcfa1afdf9749d8a Mon Sep 17 00:00:00 2001 From: Fish Date: Wed, 24 Jun 2026 16:56:59 -0700 Subject: [PATCH 2/2] Pin uefi-firmware to 1.16. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7871edcb..e0ab66e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ dependencies = [ "pyxbe~=1.0.3", "pyxdia~=0.1", "sortedcontainers>=2.0", - "uefi-firmware>=1.10", + "uefi-firmware~=1.16", ] [project.readme]