[PATCH] meta: move some text from oe-setup-builddir to conf-notes.txt

[PATCH] meta: move some text from oe-setup-builddir to conf-notes.txt

[liu.ming50]

From: Ming Liu <peter.x.liu@external.atlascopco.com>

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 <target>, so we want to show
exactly these texts on the shell console, that's why we need this
change.

Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
---
 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 2f2932b..f1a4f4d 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 <target>'
+
 Common targets are:
     core-image-minimal
     core-image-sato
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index ef49551..55d73ca 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -133,13 +133,6 @@ EOM
 #    unset SHOWYPDOC
 fi
 
-cat <<EOM
-
-### Shell environment set up for builds. ###
-
-You can now run 'bitbake <target>'
-
-EOM
 if [ -z "$OECORENOTESCONF" ]; then
     OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt"
 fi
-- 
2.7.4

Re: [PATCH] meta: move some text from oe-setup-builddir to conf-notes.txt

[Leonardo Sandoval]

On Mon, 2017-08-21 at 13:45 +0200, liu.ming50@gmail.com wrote:
> From: Ming Liu <peter.x.liu@external.atlascopco.com>
> 
> 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 <target>, so we want to show
> exactly these texts on the shell console, that's why we need this
> change.
> 

I do not clearly spot the real gain. oe-setup-buildir just plots the
header and you can include what you specific stuff into conf-notes. The
header string does not strictly belongs to conf-notes, at least not
semantically.


> Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
> ---
>  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 2f2932b..f1a4f4d 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 <target>'
> +
>  Common targets are:
>      core-image-minimal
>      core-image-sato
> diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
> index ef49551..55d73ca 100755
> --- a/scripts/oe-setup-builddir
> +++ b/scripts/oe-setup-builddir
> @@ -133,13 +133,6 @@ EOM
>  #    unset SHOWYPDOC
>  fi
>  
> -cat <<EOM
> -
> -### Shell environment set up for builds. ###
> -
> -You can now run 'bitbake <target>'
> -
> -EOM
>  if [ -z "$OECORENOTESCONF" ]; then
>      OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt"
>  fi
> -- 
> 2.7.4
> 

Re: [PATCH] meta: move some text from oe-setup-builddir to conf-notes.txt

[Ming Liu]

[-- Attachment #1: Type: text/plain, Size: 2452 bytes --]

Hi, Leonardo:

I would like to explain our scenario: we want to show our costumers the
following tips:
...
### Shell environment set up for AtlasCopco builds. ###

You can now start a build with:
F=<features> D=<distro> M=<machine> bitbake <target> [-c task]
...

and they are duplicated with the header in oe-setup-buildir, I could not
find a way to override them without this patch. Or maybe you have any other
suggestions?

//Ming Liu


2017-08-21 16:47 GMT+02:00 Leonardo Sandoval <
leonardo.sandoval.gonzalez@linux.intel.com>:

> On Mon, 2017-08-21 at 13:45 +0200, liu.ming50@gmail.com wrote:
> > From: Ming Liu <peter.x.liu@external.atlascopco.com>
> >
> > 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 <target>, so we want to show
> > exactly these texts on the shell console, that's why we need this
> > change.
> >
>
> I do not clearly spot the real gain. oe-setup-buildir just plots the
> header and you can include what you specific stuff into conf-notes. The
> header string does not strictly belongs to conf-notes, at least not
> semantically.
>
>
> > Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
> > ---
> >  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 2f2932b..f1a4f4d 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 <target>'
> > +
> >  Common targets are:
> >      core-image-minimal
> >      core-image-sato
> > diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
> > index ef49551..55d73ca 100755
> > --- a/scripts/oe-setup-builddir
> > +++ b/scripts/oe-setup-builddir
> > @@ -133,13 +133,6 @@ EOM
> >  #    unset SHOWYPDOC
> >  fi
> >
> > -cat <<EOM
> > -
> > -### Shell environment set up for builds. ###
> > -
> > -You can now run 'bitbake <target>'
> > -
> > -EOM
> >  if [ -z "$OECORENOTESCONF" ]; then
> >      OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt"
> >  fi
> > --
> > 2.7.4
> >
>
>
>

[-- Attachment #2: Type: text/html, Size: 3645 bytes --]