Skip to content

Commit 4f94355

Browse files
authored
Unvendor uefi-firmware and pin it to ~1.16 (#698)
* Revert "Vendor uefi-firmware as a submodule. (#690)" This reverts commit 944c87a. * Pin uefi-firmware to 1.16.
1 parent 846b35c commit 4f94355

6 files changed

Lines changed: 2 additions & 34 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
- uses: actions/checkout@v6
2222
with:
2323
path: cle
24-
submodules: recursive
2524
- uses: actions/checkout@v6
2625
with:
2726
repository: angr/binaries

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

.readthedocs.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
33

44
version: 2
5-
submodules:
6-
include: all
7-
recursive: true
85
sphinx:
96
configuration: docs/conf.py
107
formats: [pdf]

deps/uefi-firmware

Lines changed: 0 additions & 1 deletion
This file was deleted.

pyproject.toml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dependencies = [
2727
"pyxbe~=1.0.3",
2828
"pyxdia~=0.1",
2929
"sortedcontainers>=2.0",
30+
"uefi-firmware~=1.16",
3031
]
3132

3233
[project.readme]
@@ -60,29 +61,6 @@ testing = [
6061
[tool.setuptools]
6162
include-package-data = true
6263

63-
[tool.setuptools.packages.find]
64-
where = [".", "deps/uefi-firmware"]
65-
include = ["cle*", "uefi_firmware*"]
66-
67-
[[tool.setuptools.ext-modules]]
68-
name = "uefi_firmware.efi_compressor"
69-
include-dirs = ["deps/uefi-firmware/uefi_firmware/compression/Include"]
70-
sources = [
71-
"deps/uefi-firmware/uefi_firmware/compression/EfiCompressor.c",
72-
"deps/uefi-firmware/uefi_firmware/compression/LZMA/LzmaCompress.c",
73-
"deps/uefi-firmware/uefi_firmware/compression/LZMA/LzmaDecompress.c",
74-
"deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/Bra.c",
75-
"deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/Bra86.c",
76-
"deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/CpuArch.c",
77-
"deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/LzFind.c",
78-
"deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/LzmaDec.c",
79-
"deps/uefi-firmware/uefi_firmware/compression/LZMA/SDK/C/LzmaEnc.c",
80-
"deps/uefi-firmware/uefi_firmware/compression/Tiano/Decompress.c",
81-
"deps/uefi-firmware/uefi_firmware/compression/Tiano/EfiCompress.c",
82-
"deps/uefi-firmware/uefi_firmware/compression/Tiano/TianoCompress.c",
83-
]
84-
py-limited-api=true
85-
8664
[tool.setuptools.dynamic]
8765
version = { attr = "cle.__version__" }
8866

tests/test_clemory.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
import cle
88

99

10-
def disabled_test_cclemory(): # pylint: disable=no-member
10+
def test_cclemory(): # pylint: disable=no-member
1111
# This is a test case for C-backed Clemory.
12-
# Fish disabled this test case until the bug in py-cffi is fixed:
13-
# https://github.com/python-cffi/cffi/issues/246
1412

1513
clemory = cle.Clemory(None, root=True)
1614
clemory.add_backer(0, b"\x90" * 1000)

0 commit comments

Comments
 (0)