From d671d6a606771262e172023158048a5a7f31375d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?=
<bernhard.rosenkraenzer.ext@huawei.com>
Date: Thu, 21 Oct 2021 14:08:33 +0200
Subject: [PATCH] oniro*.{conf,inc}: Set toolchain component versions in one
place
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It's better to use the same version of toolchain components across
different kernels -- set the defaults in oniro.inc instead of
just oniro-linux.conf
Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
---
meta-oniro-core/conf/distro/include/oniro.inc | 6 ++++++
meta-oniro-core/conf/distro/oniro-linux.conf | 4 ----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta-oniro-core/conf/distro/include/oniro.inc b/meta-oniro-core/conf/distro/include/oniro.inc
index f9c151a5..fa99e0d1 100644
--- a/meta-oniro-core/conf/distro/include/oniro.inc
+++ b/meta-oniro-core/conf/distro/include/oniro.inc
@@ -11,6 +11,12 @@ INHERIT += "oniro-sanity"
# them only the blueprint distributions.
BBMASK += "oniro/meta-oniro-blueprints/"
+# Default versions of toolchain components
+# (can be overridden in kernel specific files if necessary)
+BINUVERSION ?= "2.37%"
+GCCVERSION ?= "11.%"
+GLIBCVERSION ?= "2.33%"
+
# This is the ugliest fix possible but it fixes the build while keeping
# meta-freertos around. meta-freertos is pulling in a dependency on
# meta-poky-bsp without a reason that we can put a finger on and given that we
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 871a1ce4..dc17c029 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -93,10 +93,6 @@ require conf/distro/include/oniro-wic.inc
TCLIBC ?= "musl"
-BINUVERSION ?= "2.37%"
-GCCVERSION ?= "11.%"
-GLIBCVERSION ?= "2.33%"
-
INIT_MANAGER = "systemd"
# Remove some of the default Poky DISTRO_FEATURES we inherited, but do not use.
--
GitLab