Skip to contentSkip to conversation

bitbake.conf: do not let DISTROOVERRIDES fall back to empty string

PATCH Masahiro Yamada 1 participant 1 message Feb 14, 2020 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi.

Quoted 10 lines · Masahiro Yamada

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.

Please let me ping this in case this was missed.
This looks like a good clean-up to me.

Quoted 21 lines

---

 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -2
index 62b5466b71..d2b6ca840f 100644
@@ -736,7 +736,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.17.1

Signature · 2 lines
Best Regards
Masahiro Yamada