From 8340d5003d376d2d18ee605a6b0bcbf858147bf6 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 26 May 2023 20:45:29 +0100 Subject: [PATCH] gpt/DPS: add more aliases for python's machine In mkosi we set the default architecture to platform.machine() which is again slightly incompatible for a few architectures, so add more aliases, so that repart works by default with these names. --- src/shared/gpt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/shared/gpt.c b/src/shared/gpt.c index 123e57e370d..adf73257044 100644 --- a/src/shared/gpt.c +++ b/src/shared/gpt.c @@ -138,6 +138,7 @@ const GptPartitionType gpt_partition_type_table[] = { _GPT_ARCH_SEXTET(ALPHA, "alpha"), _GPT_ARCH_SEXTET(ARC, "arc"), _GPT_ARCH_SEXTET(ARM, "arm"), + _GPT_ARCH_SEXTET(ARM, "armv7l"), /* Alias: must be listed after arm */ _GPT_ARCH_SEXTET(ARM64, "arm64"), _GPT_ARCH_SEXTET(ARM64, "aarch64"), /* Alias: must be listed after arm64 */ _GPT_ARCH_SEXTET(IA64, "ia64"), @@ -148,6 +149,7 @@ const GptPartitionType gpt_partition_type_table[] = { _GPT_ARCH_SEXTET(PPC, "ppc"), _GPT_ARCH_SEXTET(PPC64, "ppc64"), _GPT_ARCH_SEXTET(PPC64_LE, "ppc64-le"), + _GPT_ARCH_SEXTET(PPC64_LE, "ppc64le"), /* Alias: must be listed after ppc64-le */ _GPT_ARCH_SEXTET(RISCV32, "riscv32"), _GPT_ARCH_SEXTET(RISCV64, "riscv64"), _GPT_ARCH_SEXTET(S390, "s390"), @@ -155,6 +157,7 @@ const GptPartitionType gpt_partition_type_table[] = { _GPT_ARCH_SEXTET(TILEGX, "tilegx"), _GPT_ARCH_SEXTET(X86, "x86"), _GPT_ARCH_SEXTET(X86_64, "x86-64"), + _GPT_ARCH_SEXTET(X86_64, "x86_64"), /* Alias: must be listed after x86-64 */ _GPT_ARCH_SEXTET(X86_64, "amd64"), /* Alias: must be listed after x86-64 */ #ifdef SD_GPT_ROOT_NATIVE { SD_GPT_ROOT_NATIVE, "root", native_architecture(), .designator = PARTITION_ROOT }, -- 2.47.3