Skip to contentSkip to conversation

support/config-fragments/autobuild: fix riscv64 toolchain configs

PATCH Applied Julien Olivain 3 participants 4 messages Jan 1, 2022 – Jan 4, 2022 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 support/config-fragments/autobuild: fix riscv64 toolchain configs

commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 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.

---
 .../config-fragments/autobuild/bootlin-riscv64-glibc.config   | 4 ++--
 .../config-fragments/autobuild/bootlin-riscv64-musl.config    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
support/config-fragments/autobuild/bootlin-riscv64-glibc.config +2 -2
index f6c6fcaa36..433a6e89f7 100644
@@ -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
support/config-fragments/autobuild/bootlin-riscv64-musl.config +2 -2
index 2b6a6e56da..fee1f29f4a 100644
@@ -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
Signature · 6 lines
2.33.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 19 lines · Julien Olivain

commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 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:

Quoted 8 lines

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.

Applied to master, thanks.

While reviewing this, I noticed that
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE in fact never existed, so I sent a patch to fix that as well [1]. Unfortunately, I forgot to Cc Thomas on that, so Thomas consider yourself CCed now :-)

Regards,
Arnout

Quoted 23 lines
---
  .../config-fragments/autobuild/bootlin-riscv64-glibc.config   | 4 ++--
  .../config-fragments/autobuild/bootlin-riscv64-musl.config    | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
support/config-fragments/autobuild/bootlin-riscv64-glibc.config +2 -2
index f6c6fcaa36..433a6e89f7 100644
@@ -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
support/config-fragments/autobuild/bootlin-riscv64-musl.config +0 -0
index 2b6a6e56da..fee1f29f4a 100644

support/config-fragments/autobuild/bootlin-riscv64-musl.config line 4

Quoted 6 lines
support/config-fragments/autobuild/bootlin-riscv64-musl.config +2 -2
@@ -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

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw
Quoted 26 lines · Arnout Vandecappelle
Quoted 23 lines · Julien Olivain

commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 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

Quoted 9 lines
Quoted 4 lines

This commit update the autobuild config fragments for RISC-V 64bit toolchains so they can be used by test-pkg.

 Applied to master, thanks.

 While reviewing this, I noticed that BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE in fact never existed, so I sent a patch to fix that as well [1]. Unfortunately, I forgot to Cc Thomas on that, so Thomas consider yourself CCed now :-)

[1] https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

 Regards,
 Arnout

Quoted 25 lines

 Regards,
 Arnout

Quoted 21 lines

---
  .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++--

  2 files changed, 4 insertions(+), 4 deletions(-)
support/config-fragments/autobuild/bootlin-riscv64-glibc.config +0 -0
index f6c6fcaa36..433a6e89f7 100644
@@ -1,5 +1,5 @@

  BR2_riscv=y

support/config-fragments/autobuild/bootlin-riscv64-glibc.config +1 -1
-BR2_RISCV_ABI_LP64=y
+BR2_RISCV_ABI_LP64D=y

  BR2_TOOLCHAIN_EXTERNAL=y
  BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y

support/config-fragments/autobuild/bootlin-riscv64-glibc.config +1 -1
-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y
support/config-fragments/autobuild/bootlin-riscv64-musl.config +0 -0
index 2b6a6e56da..fee1f29f4a 100644
Quoted 8 lines

support/config-fragments/autobuild/bootlin-riscv64-musl.config line 4

Quoted 8 lines
support/config-fragments/autobuild/bootlin-riscv64-musl.config +0 -0
@@ -1,4 +1,4 @@

  BR2_riscv=y

support/config-fragments/autobuild/bootlin-riscv64-musl.config +1 -1
-BR2_RISCV_ABI_LP64=y
+BR2_RISCV_ABI_LP64D=y

  BR2_TOOLCHAIN_EXTERNAL=y

support/config-fragments/autobuild/bootlin-riscv64-musl.config +1 -1
-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw
In reply to Arnout Vandecappelle

Arnout, All,

On 2022-01-04 18:16 +0100, Arnout Vandecappelle spake thusly:

Quoted 27 lines · Julien Olivain
Quoted 26 lines

commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 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.

Quoted 8 lines
Quoted 1 line

Applied to master, thanks.

While reviewing this, I noticed that
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE in fact never existed, so I sent a patch to fix that as well [1]. Unfortunately, I forgot to Cc Thomas on that, so Thomas consider yourself CCed now :-)

Ah, I see how you noticed that issue, now.

Regards,
Yann E. MORIN.

Quoted 37 lines

Regards,
Arnout

Quoted 23 lines
---
 .../config-fragments/autobuild/bootlin-riscv64-glibc.config   | 4 ++--
 .../config-fragments/autobuild/bootlin-riscv64-musl.config    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
support/config-fragments/autobuild/bootlin-riscv64-glibc.config +2 -2
index f6c6fcaa36..433a6e89f7 100644
@@ -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
support/config-fragments/autobuild/bootlin-riscv64-musl.config +0 -0
index 2b6a6e56da..fee1f29f4a 100644

support/config-fragments/autobuild/bootlin-riscv64-musl.config line 4

Quoted 6 lines
support/config-fragments/autobuild/bootlin-riscv64-musl.config +2 -2
@@ -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

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot