Skip to contentSkip to conversation

Revert "toolchain/toolchain-external: error if BR2_TOOLCHAIN_EXTERNAL_PATH is not set"

PATCH Applied Thomas Petazzoni via buildroot 2 participants 4 messages Apr 28, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "toolchain/toolchain-external: error if BR2_TOOLCHAIN_EXTERNAL_PATH is not set"

This reverts commit 8945ba49480a7885d104445ca855ef7681a374ff.

This commit is incorrect, as it is perfectly valid for BR2_TOOLCHAIN_EXTERNAL_PATH to be empty. The help text of BR2_TOOLCHAIN_EXTERNAL_PATH even documents it as a supported case:

If empty, the compiler will be searched in $PATH.

Commit 392b0a26f5fd8d3aedce7e0c15f9762a79312f01 ("toolchain-external:
default BR2_TOOLCHAIN_EXTERNAL_PATH to empty") even made that the default saying "In addition, it in fact works correctly when it is empty. In that case, the toolchain will be searched in PATH."

A user has reported that commit 8945ba49480a7885d104445ca855ef7681a374ff breaks his use-case:

https://lore.kernel.org/buildroot/CADBnMvhgaozAgZgy3njckjL1i0U6bZ0fLrq-kdFF-qpGhFWgmw@mail.gmail.com/

---
This should be backported to 2022.02.x

---
 toolchain/toolchain-external/pkg-toolchain-external.mk | 5 -----
 1 file changed, 5 deletions(-)
toolchain/toolchain-external/pkg-toolchain-external.mk +0 -5
index c7f4175c9e..299b6008aa 100644
@@ -69,12 +69,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)
 else
 TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(abspath $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)))
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL)$(BR_BUILDING),yy)
-ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
-$(error No external toolchain path set, check your BR2_TOOLCHAIN_EXTERNAL_PATH setting)
-endif
 endif
-endif # BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
 
 ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
 ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
Signature · 6 lines
2.35.1

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

Thomas, All,

On 2022-04-28 23:20 +0200, Thomas Petazzoni via buildroot spake thusly:

Quoted 1 line

This reverts commit 8945ba49480a7885d104445ca855ef7681a374ff.

This is a commit on the 2022.02.x branch; it is a backport of 8e91385a2cb81c5f8114354f4494230e2aebb93a on master.

Did you meant this patch to be applied only to 2022.02.x?

I would believe it should be applied to master and backported to 2022.02 instead, no?

Regards,
Yann E. MORIN.

Quoted 48 lines

This commit is incorrect, as it is perfectly valid for BR2_TOOLCHAIN_EXTERNAL_PATH to be empty. The help text of BR2_TOOLCHAIN_EXTERNAL_PATH even documents it as a supported case:

If empty, the compiler will be searched in $PATH.

Commit 392b0a26f5fd8d3aedce7e0c15f9762a79312f01 ("toolchain-external:
default BR2_TOOLCHAIN_EXTERNAL_PATH to empty") even made that the default saying "In addition, it in fact works correctly when it is empty. In that case, the toolchain will be searched in PATH."

A user has reported that commit 8945ba49480a7885d104445ca855ef7681a374ff breaks his use-case:

https://lore.kernel.org/buildroot/CADBnMvhgaozAgZgy3njckjL1i0U6bZ0fLrq-kdFF-qpGhFWgmw@mail.gmail.com/

---
This should be backported to 2022.02.x

---
 toolchain/toolchain-external/pkg-toolchain-external.mk | 5 -----
 1 file changed, 5 deletions(-)
toolchain/toolchain-external/pkg-toolchain-external.mk +0 -5
index c7f4175c9e..299b6008aa 100644
@@ -69,12 +69,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)
 else
 TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(abspath $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)))
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL)$(BR_BUILDING),yy)
-ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
-$(error No external toolchain path set, check your BR2_TOOLCHAIN_EXTERNAL_PATH setting)
-endif
 endif
-endif # BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
 
 ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
 ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
Signature · 6 lines
2.35.1

_______________________________________________
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
#2 lore raw
Quoted 7 lines · On Thu, 28 Apr 2022 23:50:03 +0200 "Yann E. MORIN" <[email protected]>…

On 2022-04-28 23:20 +0200, Thomas Petazzoni via buildroot spake thusly:

Quoted 1 line

This reverts commit 8945ba49480a7885d104445ca855ef7681a374ff.

This is a commit on the 2022.02.x branch; it is a backport of 8e91385a2cb81c5f8114354f4494230e2aebb93a on master.

Did you meant this patch to be applied only to 2022.02.x?

No.

Quoted 2 lines

I would believe it should be applied to master and backported to 2022.02 instead, no?

Yes, absolutely. I referred to 8e91385a2cb81c5f8114354f4494230e2aebb93a because that's what the bug reporter pointed to as the offending commit, as the bug report is on the 2022.02.x branch.

Though I agree the commit log should probably refer to the commit in master. I can send a v2 if needed.

Thanks for the review!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw
In reply to Thomas Petazzoni via buildroot

Thomas, All,

On 2022-04-28 23:20 +0200, Thomas Petazzoni via buildroot spake thusly:

Quoted 1 line

This reverts commit 8945ba49480a7885d104445ca855ef7681a374ff.

I've changes this to the corresponding sha1 on master.

Quoted 6 lines

This commit is incorrect, as it is perfectly valid for BR2_TOOLCHAIN_EXTERNAL_PATH to be empty. The help text of BR2_TOOLCHAIN_EXTERNAL_PATH even documents it as a supported case:

If empty, the compiler will be searched in $PATH.

Quoted 7 lines

Commit 392b0a26f5fd8d3aedce7e0c15f9762a79312f01 ("toolchain-external:
default BR2_TOOLCHAIN_EXTERNAL_PATH to empty") even made that the default saying "In addition, it in fact works correctly when it is empty. In that case, the toolchain will be searched in PATH."

A user has reported that commit 8945ba49480a7885d104445ca855ef7681a374ff breaks his use-case:

And here I kept that hash and added a comment that it's a backpor of the commit on master.

Quoted 4 lines

https://lore.kernel.org/buildroot/CADBnMvhgaozAgZgy3njckjL1i0U6bZ0fLrq-kdFF-qpGhFWgmw@mail.gmail.com/

Applied to master, thanks.

Quoted 2 lines

---
This should be backported to 2022.02.x

Ah, I missed that post-cpmmit-log mesage earlier.

Regards,
Yann E. MORIN.

Quoted 28 lines
---
 toolchain/toolchain-external/pkg-toolchain-external.mk | 5 -----
 1 file changed, 5 deletions(-)
toolchain/toolchain-external/pkg-toolchain-external.mk +0 -5
index c7f4175c9e..299b6008aa 100644
@@ -69,12 +69,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)
 else
 TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(abspath $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)))
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL)$(BR_BUILDING),yy)
-ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
-$(error No external toolchain path set, check your BR2_TOOLCHAIN_EXTERNAL_PATH setting)
-endif
 endif
-endif # BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
 
 ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
 ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
Signature · 6 lines
2.35.1

_______________________________________________
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