From: "Masahiro Yamada" <masahiroy@kernel.org>
To: openembedded-core@lists.openembedded.org,
Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH RESEND] bitbake.conf: do not let DISTROOVERRIDES fall back to empty string
Date: Sun, 26 Apr 2020 00:19:08 +0900 [thread overview]
Message-ID: <20200425151908.1020349-1-masahiroy@kernel.org> (raw)
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 <masahiroy@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
next reply other threads:[~2020-04-25 15:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-25 15:19 Masahiro Yamada [this message]
2020-04-25 15:38 ` [PATCH RESEND] bitbake.conf: do not let DISTROOVERRIDES fall back to empty string Richard Purdie
2020-04-25 21:37 ` [OE-core] " Andre McCurdy
2020-04-26 8:12 ` Richard Purdie
2020-04-26 14:57 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200425151908.1020349-1-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.