From 6490b452a235f07bc17a80812aab00651abf665e Mon Sep 17 00:00:00 2001 From: Emanuele Aina <emanuele.aina@collabora.com> Date: Wed, 3 Mar 2021 11:29:46 +0100 Subject: [PATCH] ade sysroot: Allow installation of amd64 sysroots Running `ade sysroot install --release v2021dev3 --arch amd64` results in `ade` complaining with: usage: ade sysroot install [-h] [--verbose] [--distro DISTRO] [--release RELEASE] [--arch {armhf,arm64}] [--url URL] [--user USER] [--password PASSWORD] [--netrc NETRC] [--file FILE] [--force] ade sysroot install: error: argument --arch: invalid choice: 'amd64' (choose from 'armhf', 'arm64') This means that developers attempting to target amd64 targets aren't going to be able to follow the ADE documentation and we can't easily target different releases using ADE when using an amd64 target, so sync the list of allowable values with the main list of the kind of sysroots we support. Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com> --- tools/ade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ade b/tools/ade index a83352a..7b53123 100755 --- a/tools/ade +++ b/tools/ade @@ -1605,7 +1605,7 @@ if __name__ == '__main__': sysroot_id_parser.add_argument('--verbose', help="Verbose output", action='store_true') sysroot_id_parser.add_argument('--distro', help="Distribution name (e.g. apertis)") sysroot_id_parser.add_argument('--release', help="Distribution release version (e.g. 16.09)") - sysroot_id_parser.add_argument('--arch', help="Sysroot architecture", choices=['armhf', 'arm64']) + sysroot_id_parser.add_argument('--arch', help="Sysroot architecture", choices=[i[1] for i in TargetTriplet.SUPPORTED]) sysroot_url_parser = argparse.ArgumentParser(add_help=False) sysroot_url_parser.add_argument('--url', help="Sysroot download URL") sysroot_auth_parser = argparse.ArgumentParser(add_help=False) -- GitLab