Commit abacd7243a2e ("bitbake.conf: fix distro-less failure expanding
FILESPATH") mended the littered DISROOVERRIDES when DISTRO is unset.

Some time later, commit b7279f996397 ("bitbake.conf: Default DISTRO to
nodistro") added a weak default to 'DISTRO'.

So, this line can go back to the original simple definition.

Signed-off-by: Masahiro Yamada <masahi...@kernel.org>
---

 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4b544a22cd..eb3dd0007e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -739,7 +739,7 @@ DISTRO_NAME ??= "OpenEmbedded"
 OVERRIDES = 
"${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable"
 LIBCOVERRIDE ?= ""
 CLASSOVERRIDE ?= "class-target"
-DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
+DISTROOVERRIDES ?= "${DISTRO}"
 MACHINEOVERRIDES ?= "${MACHINE}"
 
 FILESOVERRIDES = 
"${TRANSLATED_TARGET_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}"
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#137464): 
https://lists.openembedded.org/g/openembedded-core/message/137464
Mute This Topic: https://lists.openembedded.org/mt/73264220/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to