2
0
mirror of git://github.com/lxc/lxc synced 2025-08-29 14:29:51 +00:00

Merge pull request #4002 from xypron/riscv64

Riscv64
This commit is contained in:
Stéphane Graber 2021-10-19 10:58:23 -04:00 committed by GitHub
commit 7af27b3290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions

View File

@ -108,6 +108,7 @@ features. This includes (but isn't limited to):
- i686 - i686
- x86_64 - x86_64
- ppc, ppc64, ppc64le - ppc, ppc64, ppc64le
- riscv64
- s390x - s390x
- armvl7, arm64 - armvl7, arm64

View File

@ -285,7 +285,7 @@ _lxc_attach() {
;; ;;
--arch | -a ) --arch | -a )
# https://github.com/lxc/lxc/blob/stable-4.0/src/tests/arch_parse.c#L37 # https://github.com/lxc/lxc/blob/stable-4.0/src/tests/arch_parse.c#L37
COMPREPLY=( $( compgen -W 'arm armel armhf armv7l athlon i386 i486 i586 i686 linux32 mips mipsel ppc powerpc x86 aarch64 amd64 arm64 linux64 mips64 mips64el ppc64 ppc64el ppc64le powerpc64 s390x x86_64' -- "${cur}" ) ) COMPREPLY=( $( compgen -W 'arm armel armhf armv7l athlon i386 i486 i586 i686 linux32 mips mipsel ppc powerpc x86 aarch64 amd64 arm64 linux64 mips64 mips64el ppc64 ppc64el ppc64le powerpc64 riscv64 s390x x86_64' -- "${cur}" ) )
return return
;; ;;
--elevated-privileges | -e ) --elevated-privileges | -e )

View File

@ -3215,6 +3215,7 @@ int lxc_config_parse_arch(const char *arch, signed long *persona)
{ "ppc64el", PER_LINUX }, { "ppc64el", PER_LINUX },
{ "ppc64le", PER_LINUX }, { "ppc64le", PER_LINUX },
{ "powerpc64", PER_LINUX }, { "powerpc64", PER_LINUX },
{ "riscv64", PER_LINUX },
{ "s390x", PER_LINUX }, { "s390x", PER_LINUX },
{ "x86_64", PER_LINUX }, { "x86_64", PER_LINUX },
}; };

View File

@ -38,7 +38,7 @@ static const char *const arches[] = {
"arm", "armel", "armhf", "armv7l", "athlon", "i386", "i486", "arm", "armel", "armhf", "armv7l", "athlon", "i386", "i486",
"i586", "i686", "linux32", "mips", "mipsel", "ppc", "powerpc", "i586", "i686", "linux32", "mips", "mipsel", "ppc", "powerpc",
"x86", "aarch64", "amd64", "arm64", "linux64", "mips64", "mips64el", "x86", "aarch64", "amd64", "arm64", "linux64", "mips64", "mips64el",
"ppc64", "ppc64el", "ppc64le", "powerpc64", "s390x", "x86_64", "ppc64", "ppc64el", "ppc64le", "powerpc64", "riscv64", "s390x", "x86_64",
}; };
static bool parse_valid_architectures(void) static bool parse_valid_architectures(void)