diff mbox series

[2/2] tcmode-default: eliminate needless binutils defaults

Message ID 20250311162532.1676284-2-Randy.MacLeod@windriver.com
State New
Headers show
Series [1/2] tcmode-default: eliminate needless rust, cargo defaults | expand

Commit Message

Randy MacLeod March 11, 2025, 4:25 p.m. UTC
From: Randy MacLeod <Randy.MacLeod@windriver.com>

Manually setting preferred version/provider is not required so remove
that for binutils.

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
 meta/conf/distro/include/tcmode-default.inc | 10 ----------
 1 file changed, 10 deletions(-)

Comments

Richard Purdie March 11, 2025, 10:06 p.m. UTC | #1
On Tue, 2025-03-11 at 12:25 -0400, Randy MacLeod via lists.openembedded.org wrote:
> From: Randy MacLeod <Randy.MacLeod@windriver.com>
> 
> Manually setting preferred version/provider is not required so remove
> that for binutils.
> 
> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
> ---
>  meta/conf/distro/include/tcmode-default.inc | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> index 5cc93405f1..2a3c16e2bd 100644
> --- a/meta/conf/distro/include/tcmode-default.inc
> +++ b/meta/conf/distro/include/tcmode-default.inc
> @@ -2,16 +2,11 @@
>  # Default toolchain configuration
>  #
>  
> -PREFERRED_PROVIDER_virtual/cross-binutils = "${MLPREFIX}binutils-cross-${TARGET_ARCH}"
> -PREFERRED_PROVIDER_virtual/cross-binutils:class-nativesdk ?= "binutils-crosssdk-${SDK_SYS}"
> -PREFERRED_PROVIDER_virtual/nativesdk-cross-binutils ?= "binutils-crosssdk-${SDK_SYS}"
> -
>  #

I suspect we need to keep this bit since these are not direct mappings.
It was the version preference which I think we may be able to drop as
there is only one version.

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 5cc93405f1..2a3c16e2bd 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -2,16 +2,11 @@ 
 # Default toolchain configuration
 #
 
-PREFERRED_PROVIDER_virtual/cross-binutils = "${MLPREFIX}binutils-cross-${TARGET_ARCH}"
-PREFERRED_PROVIDER_virtual/cross-binutils:class-nativesdk ?= "binutils-crosssdk-${SDK_SYS}"
-PREFERRED_PROVIDER_virtual/nativesdk-cross-binutils ?= "binutils-crosssdk-${SDK_SYS}"
-
 # Default libc config
 PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 
 GCCVERSION ?= "14.%"
 SDKGCCVERSION ?= "${GCCVERSION}"
-BINUVERSION ?= "2.44%"
 GLIBCVERSION ?= "2.41%"
 LINUXLIBCVERSION ?= "6.12%"
 
@@ -29,11 +24,6 @@  PREFERRED_VERSION_libgfortran ?= "${GCCVERSION}"
 PREFERRED_VERSION_nativesdk-gcc ?= "${SDKGCCVERSION}"
 PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
 PREFERRED_VERSION_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}"
-PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-native ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-crosssdk-${SDK_SYS} ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}"
 
 PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
 PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}"