rely on original lorax manifest to build excludes

This commit is contained in:
Louis Abel 2023-03-14 00:56:01 -07:00
parent f88a3e1534
commit 34c8ee08ab
Signed by: label
GPG Key ID: B37E62D143879B36

View File

@ -1208,26 +1208,27 @@ class IsoBuild:
arch arch
) )
xorrs = '{}/xorriso-{}.txt'.format( xorrs = '{}/xorriso-{}-{}.txt'.format(
lorax_base_dir, lorax_base_dir,
iso,
arch arch
) )
# Generate exclusion list/dict
boot_manifest = '{}/lorax/images/boot.iso.manifest'.format(lorax_base_dir)
try:
with open(boot_manifest) as i:
ignores = set(line.lstrip("/").rstrip("\n") for line in i)
except Exception as e:
self.log.error(Color.FAIL + 'File was likely not found.')
raise SystemExit(e)
self._write_grafts( self._write_grafts(
grafts, grafts,
xorrs, xorrs,
files, files,
exclude=[ exclude=ignores
"*/lost+found",
"*/boot.iso",
"*/boot.iso.manifest",
"EFI/*",
"images/*",
"isolinux/*",
"boot/*",
"ppc/*",
"generic.ins"
]
) )
if self.iso_map['xorrisofs']: if self.iso_map['xorrisofs']: