From 80bc8282df58dfeaae8f2f71ed2617d718e29f8b Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 21 Aug 2017 13:45:52 +0200 Subject: [PATCH] meta: move some text from oe-setup-builddir to conf-notes.txt This allows the end users to be able to override the entire notes showing on the shell console. For instance, Our company uses a external conf-notes.txt, and we run bitbake with some extra variables, looks like: F=xxx D=xxx M=xxx bitbake , so we want to show exactly these texts on the shell console, that's why we need this change. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/conf/conf-notes.txt | 5 +++++ scripts/oe-setup-builddir | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/meta/conf/conf-notes.txt b/meta/conf/conf-notes.txt index 2f2932ba1f..f1a4f4da14 100644 --- a/meta/conf/conf-notes.txt +++ b/meta/conf/conf-notes.txt @@ -1,3 +1,8 @@ + +### Shell environment set up for builds. ### + +You can now run 'bitbake ' + Common targets are: core-image-minimal core-image-sato diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index ef495517aa..55d73ca1e4 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -133,13 +133,6 @@ EOM # unset SHOWYPDOC fi -cat <' - -EOM if [ -z "$OECORENOTESCONF" ]; then OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt" fi -- 2.40.1