|
54 | 54 | )
|
55 | 55 | from .simple_project import SimpleProject
|
56 | 56 | from ..config.compilation_targets import CompilationTargets
|
57 |
| -from ..mtree import MtreeFile |
| 57 | +from ..mtree import MtreeFile, MtreePath |
58 | 58 | from ..utils import AnsiColour, classproperty, coloured, include_local_file
|
59 | 59 |
|
60 | 60 | # Notes:
|
@@ -242,7 +242,7 @@ def __init__(self, *args, **kwargs) -> None:
|
242 | 242 | self.hostname = os.path.expandvars(self.hostname) # Expand env vars in hostname to allow $CHERI_BITS
|
243 | 243 | # MIPS needs big-endian disk images
|
244 | 244 | self.big_endian = self.compiling_for_mips(include_purecap=True)
|
245 |
| - self.stripped_contents: "dict[Union[str,Path], Path]" = {} |
| 245 | + self.stripped_contents: "dict[Union[str,PurePath], PurePath]" = {} |
246 | 246 |
|
247 | 247 | @cached_property
|
248 | 248 | def source_project(self) -> BuildFreeBSD:
|
@@ -342,7 +342,7 @@ def add_from_mtree(
|
342 | 342 | if strip_binaries:
|
343 | 343 | # Try to shrink the size by stripping all elf binaries
|
344 | 344 | entry = self.mtree.get(mtree_path)
|
345 |
| - contents = entry.attributes.get("contents", entry.path) |
| 345 | + contents = MtreePath(entry.attributes.get("contents", entry.path)) |
346 | 346 | if contents not in self.stripped_contents:
|
347 | 347 | stripped_path = self.tmpdir / entry.path
|
348 | 348 | file = self.rootfs_dir / contents
|
|
0 commit comments