parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-02-23 05:35:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices/{device,deviceinfo}: tolerate device variants that live inside split packages

Browse source
This commit is contained in:
InsanePrawn 2022-10-31 01:27:03 +01:00
parent 22bd6193dd
commit 3b7465dccb
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
devices/device.py
View file

@ -128,7 +128,8 @@ def get_device(name: str, pkgbuilds: Optional[dict[str, Pkgbuild]] = None, lazy:
if scan_all: if scan_all:
devices = get_devices(pkgbuilds=pkgbuilds, lazy=lazy) devices = get_devices(pkgbuilds=pkgbuilds, lazy=lazy)
if name not in devices: if name not in devices:
raise Exception(f'Unknown device {name}!') raise Exception(f'Unknown device {name}!\n'
f'Available: {list(devices.keys())}')
return devices[name] return devices[name]
else: else:
pkgname = f'device-{name}' pkgname = f'device-{name}'
@ -143,7 +144,8 @@ def get_device(name: str, pkgbuilds: Optional[dict[str, Pkgbuild]] = None, lazy:
init_pkgbuilds() init_pkgbuilds()
relative_path = os.path.join('device', pkgname) relative_path = os.path.join('device', pkgname)
if not os.path.exists(os.path.join(config.get_path('pkgbuilds'), relative_path)): if not os.path.exists(os.path.join(config.get_path('pkgbuilds'), relative_path)):
raise Exception(f'unknown device "{name}": pkgbuilds/{relative_path} doesn\'t exist.') logging.debug(f'Exact device pkgbuild path "pkgbuilds/{relative_path}" doesn\'t exist, scanning entire repo')
return get_device(name, pkgbuilds=pkgbuilds, lazy=lazy, scan_all=True)
pkgbuild = [p for p in get_pkgbuild_by_path(relative_path, lazy=lazy, _config=config) if p.name == pkgname][0] pkgbuild = [p for p in get_pkgbuild_by_path(relative_path, lazy=lazy, _config=config) if p.name == pkgname][0]
device = parse_device_pkg(pkgbuild) device = parse_device_pkg(pkgbuild)
if lazy: if lazy:

4
devices/deviceinfo.py
View file

@ -169,7 +169,9 @@ def _pmos_sanity_check(info: dict[str, str], device_name: str):
codename = codename[7:] codename = codename[7:]
# kupfer prepends the SoC # kupfer prepends the SoC
codename_alternative = codename.split('-', maxsplit=1)[1] if codename.count('-') > 1 else codename codename_alternative = codename.split('-', maxsplit=1)[1] if codename.count('-') > 1 else codename
if "codename" not in info or (codename != info["codename"] and codename_alternative != info["codename"]): _codename = info.get('codename', None)
if not _codename or not (_codename in [codename, codename_alternative] or codename.startswith(_codename) or
codename_alternative.startswith(_codename)):
raise RuntimeError(f"Please add 'deviceinfo_codename=\"{codename}\"' " raise RuntimeError(f"Please add 'deviceinfo_codename=\"{codename}\"' "
f"to: {path}") f"to: {path}")