From 4c92ef3dd8f6b83c33d8e4fad2e2ac2d2a2d6a39 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 1 Jan 2022 22:39:48 +0100 Subject: [PATCH] support/config-fragments/autobuild: fix bootlin-riscv64 configs commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 bootlin toolchains by RISC-V LP64D. The config symbols BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. Those changes were not reflected in the autobuild toolchain configs in support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config When testing a package with the command: ./utils/test-pkg --all --package somepackage bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build logfile contains: [...] Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y Actual value: Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y Actual value: # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set This commit update the autobuild config fragments for RISC-V 64bit toolchains so they can be used by test-pkg. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config index f6c6fcaa36..433a6e89f7 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config index 2b6a6e56da..fee1f29f4a 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config @@ -1,4 +1,4 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y