On Sat, Apr 25, 2020 at 8:38 AM Richard Purdie <richard.pur...@linuxfoundation.org> wrote: > On Sun, 2020-04-26 at 00:19 +0900, Masahiro Yamada wrote: > > 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}${LIBCOV > > ERRIDE}:forcevariable" > > LIBCOVERRIDE ?= "" > > CLASSOVERRIDE ?= "class-target" > > -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 ?
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137491): https://lists.openembedded.org/g/openembedded-core/message/137491 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] -=-=-=-=-=-=-=-=-=-=-=-