Skip to contentSkip to conversation

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

PATCH RESEND In review Masahiro Yamada 3 participants 5 messages Apr 25, 2020 – Apr 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 bitbake.conf: do not let DISTROOVERRIDES fall back to empty string

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.

---

 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 4b544a22cd..eb3dd0007e 100644
@@ -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}"
Signature · 1 line
2.25.1
#1 lore raw
Quoted 25 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.

---

 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +0 -0
index 4b544a22cd..eb3dd0007e 100644
@@ -739,7 +739,7 @@ DISTRO_NAME ??= "OpenEmbedded"
 OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-

${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOV ERRIDE}:forcevariable"
LIBCOVERRIDE ?= ""
CLASSOVERRIDE ?= "class-target"

meta/conf/bitbake.conf DISTRO_NAME ??= "OpenEmbedded" · line 743

Quoted 3 lines
meta/conf/bitbake.conf +1 -1
-DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
+DISTROOVERRIDES ?= "${DISTRO}"
 MACHINEOVERRIDES ?= "${MACHINE}"

Whilst this can't happen with our standard definitions now, the side effects of it not being set are nasty so I'd prefer to retain this.

Cheers,

Richard

#2 lore raw
Quoted 16 lines · Richard Purdie
Quoted 15 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.

---

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

meta/conf/bitbake.conf DISTRO_NAME ??= "OpenEmbedded" · line 743

Quoted 13 lines
meta/conf/bitbake.conf +0 -0
index 4b544a22cd..eb3dd0007e 100644
@@ -739,7 +739,7 @@ DISTRO_NAME ??= "OpenEmbedded"
 OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-

${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOV ERRIDE}:forcevariable"
LIBCOVERRIDE ?= ""
CLASSOVERRIDE ?= "class-target"

meta/conf/bitbake.conf +1 -1
-DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
+DISTROOVERRIDES ?= "${DISTRO}"
 MACHINEOVERRIDES ?= "${MACHINE}"

Whilst this can't happen with our standard definitions now, the side effects of it not being set are nasty so I'd prefer to retain this.

What exactly can go wrong? MACHINEOVERRIDES is empty every time we build a -native recipe, so just having :: in OVERRIDES or FILESOVERRIDES doesn't appear to be an issue. Is there something special about DISTROOVERRIDES ?

#3 lore raw
Quoted 22 lines · Andre McCurdy
Quoted 11 lines · Richard Purdie
Quoted 10 lines · Masahiro Yamada
meta/conf/bitbake.conf +0 -0
index 4b544a22cd..eb3dd0007e 100644
@@ -739,7 +739,7 @@ DISTRO_NAME ??= "OpenEmbedded"
 OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-

${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LI BCOV
ERRIDE}:forcevariable"
LIBCOVERRIDE ?= ""

Quoted 8 lines

meta/conf/bitbake.conf DISTRO_NAME ??= "OpenEmbedded" · line 743

Quoted 4 lines

CLASSOVERRIDE ?= "class-target"

meta/conf/bitbake.conf +1 -1
-DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
+DISTROOVERRIDES ?= "${DISTRO}"
 MACHINEOVERRIDES ?= "${MACHINE}"

Whilst this can't happen with our standard definitions now, the side
effects of it not being set are nasty so I'd prefer to retain this.

Quoted 4 lines

What exactly can go wrong? MACHINEOVERRIDES is empty every time we build a -native recipe, so just having :: in OVERRIDES or FILESOVERRIDES doesn't appear to be an issue. Is there something special about DISTROOVERRIDES ?

native.bbclass sets MACHINEOVERRIDES = "" whereas with this change DISTROOVERRIDES would be set to "${DISTRO}" instead of "" as it currently is today. I think unexpanded variables were sub-optimal in FILESOVERRIDES but I don't remember the details of why.

Cheers,

Richard

#4 lore raw
Quoted 29 lines · Richard Purdie
Quoted 22 lines · Andre McCurdy
Quoted 11 lines · Richard Purdie
Quoted 10 lines · Masahiro Yamada
meta/conf/bitbake.conf +0 -0
index 4b544a22cd..eb3dd0007e 100644
@@ -739,7 +739,7 @@ DISTRO_NAME ??= "OpenEmbedded"
 OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-

${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LI BCOV
ERRIDE}:forcevariable"
LIBCOVERRIDE ?= ""

Quoted 8 lines

meta/conf/bitbake.conf DISTRO_NAME ??= "OpenEmbedded" · line 743

Quoted 4 lines

CLASSOVERRIDE ?= "class-target"

meta/conf/bitbake.conf +1 -1
-DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
+DISTROOVERRIDES ?= "${DISTRO}"
 MACHINEOVERRIDES ?= "${MACHINE}"

Whilst this can't happen with our standard definitions now, the side
effects of it not being set are nasty so I'd prefer to retain this.

Quoted 4 lines

What exactly can go wrong? MACHINEOVERRIDES is empty every time we build a -native recipe, so just having :: in OVERRIDES or FILESOVERRIDES doesn't appear to be an issue. Is there something special about DISTROOVERRIDES ?

Quoted 4 lines

native.bbclass sets MACHINEOVERRIDES = "" whereas with this change DISTROOVERRIDES would be set to "${DISTRO}" instead of "" as it currently is today. I think unexpanded variables were sub-optimal in FILESOVERRIDES but I don't remember the details of why.

Now, the same file defines this:

DISTRO ??= "nodistro"

In which case is "${DISTRO}" left unexpanded?

Signature · 2 lines
Best Regards
Masahiro Yamada