forked from Mirror/pmbootstrap
helpers: args: validate arch in sanity_check() (MR 2252)
We did the arch check when building args for some reason. Move it to the sanity checks. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
parent
1f7e352278
commit
968cf81df4
2 changed files with 7 additions and 6 deletions
|
@ -85,12 +85,6 @@ def check_pmaports_path(args: PmbArgs):
|
|||
def add_deviceinfo(args: PmbArgs):
|
||||
"""Add and verify the deviceinfo (only after initialization)"""
|
||||
setattr(args, "deviceinfo", pmb.parse.deviceinfo())
|
||||
arch = args.deviceinfo["arch"]
|
||||
if (arch != pmb.config.arch_native and
|
||||
arch not in pmb.config.build_device_architectures):
|
||||
raise ValueError("Arch '" + arch + "' is not available in"
|
||||
" postmarketOS. If you would like to add it, see:"
|
||||
" <https://postmarketos.org/newarch>")
|
||||
|
||||
|
||||
def init(args: PmbArgs) -> PmbArgs:
|
||||
|
|
|
@ -65,6 +65,13 @@ def sanity_check(info, path):
|
|||
if "arch" not in info or not info["arch"]:
|
||||
raise RuntimeError(f"Please add 'deviceinfo_arch' to: {path}")
|
||||
|
||||
arch = info["arch"]
|
||||
if (arch != pmb.config.arch_native and
|
||||
arch not in pmb.config.build_device_architectures):
|
||||
raise ValueError("Arch '" + arch + "' is not available in"
|
||||
" postmarketOS. If you would like to add it, see:"
|
||||
" <https://postmarketos.org/newarch>")
|
||||
|
||||
# "chassis" validation
|
||||
chassis_type = info["chassis"]
|
||||
if chassis_type not in chassis_types:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue