Skip to content

Commit 3addb2d

Browse files
committed
Remove source_strip_components
1 parent 07b5c18 commit 3addb2d

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

scripts/build-ffmpeg.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ def calculate_sha256(filename: str) -> str:
7171
source_url="https://storage.googleapis.com/aom-releases/libaom-3.11.0.tar.gz",
7272
sha256="cf7d103d2798e512aca9c6e7353d7ebf8967ee96fffe9946e015bb9947903e3e",
7373
requires=["cmake"],
74-
source_strip_components=1,
7574
build_system="cmake",
7675
build_arguments=[
7776
"-DENABLE_DOCS=0",

scripts/cibuildpkg.py

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ class Package:
134134
requires: list[str] = field(default_factory=list)
135135
source_dir: str = ""
136136
source_filename: str = ""
137-
source_strip_components: int = 1
138137
when: When = When.always
139138

140139
def __lt__(self, other):
@@ -424,10 +423,6 @@ def _build_x265(self, package: Package, for_builder: bool) -> None:
424423
self._build_with_cmake(package=package, for_builder=for_builder)
425424

426425
def _extract(self, package: Package) -> None:
427-
assert package.source_strip_components in (
428-
0,
429-
1,
430-
), "source_strip_components must be 0 or 1"
431426
path = os.path.join(self.build_dir, package.name)
432427
patch = os.path.join(self.patch_dir, package.name + ".patch")
433428
tarball = os.path.join(
@@ -440,16 +435,13 @@ def _extract(self, package: Package) -> None:
440435

441436
with tarfile.open(tarball) as tar:
442437
# determine common prefix to strip
443-
if package.source_strip_components:
444-
prefixes = set()
445-
for name in tar.getnames():
446-
prefixes.add(name.split("/")[0])
447-
assert len(prefixes) == 1, (
448-
"cannot strip path components, multiple prefixes found"
449-
)
450-
prefix = list(prefixes)[0]
451-
else:
452-
prefix = ""
438+
prefixes = set()
439+
for name in tar.getnames():
440+
prefixes.add(name.split("/")[0])
441+
assert len(prefixes) == 1, (
442+
"cannot strip path components, multiple prefixes found"
443+
)
444+
prefix = list(prefixes)[0]
453445

454446
# extract archive
455447
with tempfile.TemporaryDirectory(dir=self.build_dir) as temp_dir:

0 commit comments

Comments
 (0)