All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
From: "André Draszik" <git@andred.net>
To: Richard Leitner <richard.leitner@skidata.com>,
	"Davis, Michael" <michael.davis@essvote.com>
Cc: "openembedded-devel@lists.openembedded.org"
	<openembedded-devel@lists.openembedded.org>
Subject: Re: [meta-java][PATCH] java.bbclass: oe_makeclasspath does nothing without -s
Date: Tue, 21 Jan 2020 08:46:29 +0000	[thread overview]
Message-ID: <bd94e91dbbfd01500f86432e1c30ee356bb85d12.camel@andred.net> (raw)
In-Reply-To: <20200121064438.GA1567918@pcleri>

On Tue, 2020-01-21 at 07:44 +0100, Richard Leitner wrote:
> Hi,
> this is a note to let you know that I've just added this patch to the
> master-next branch of the meta-java repository at
>      git://git.yoctoproject.org/meta-java
> 
> As soon as it has gone through some more testing it will likely be
> merged to the master branch.
> 
> If you have any questions, please let me know.
> 
> regards;Richard.L
> 
> On Mon, Jan 20, 2020 at 08:28:31PM +0000, Davis, Michael wrote:
> > oe_makeclasspath is supposed to output for the target platform by default and the staging platform with -s.
> > However it checks if the file exists even if -s is not defined which is always false.
> > Additionaly remove comment around an error that never occurs.
> > 
> > Signed-off-by: Michael Davis <michael.davis@essvote.com>
> > ---
> >  classes/java.bbclass | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/classes/java.bbclass b/classes/java.bbclass
> > index fc97295..7b9677a 100644
> > --- a/classes/java.bbclass
> > +++ b/classes/java.bbclass
> > @@ -80,8 +80,6 @@ oe_makeclasspath() {
> >    # in variable "bootcp".
> >    # 
> >    # Provide the -s at the beginning otherwise strange things happen.
> > -  # If -s is given the function checks whether the requested jar file exists
> > -  # and exits with an error message if it cannot be found.
> >    #
> >    # Note: In order to encourage usage of the DEPENDS variable, the function
> >    # can accept recipe names. If a recipe has no corresponding Jar file it
> > @@ -91,6 +89,7 @@ oe_makeclasspath() {
> >    classpath=
> >    delimiter=
> >    retval=$1
> > +  staging=false
> >  
> >    shift
> >  
> > @@ -106,6 +105,7 @@ oe_makeclasspath() {
> >                    dir=${STAGING_DATADIR_JAVA}
> >                    ;;
> >                esac
> > +              staging=true
> >                ;;
> >            -*)
> >                bbfatal "oe_makeclasspath: unknown option: $1"
> > @@ -113,9 +113,9 @@ oe_makeclasspath() {
> >            *)
> >                file=$dir/$1.jar
> >  
> > -              if [ -e $file ]; then
> > -                  classpath=$classpath$delimiter$file
> > -                  delimiter=":"
> > +              if [ $staging == false ] || [ -e $file ]; then
                                 ^^
Can you please remove this bashism. One '=' is enough.

Cheers,
Andre'


> > +                classpath=$classpath$delimiter$file
> > +                delimiter=":"
> >                fi
> >  
> >            ;;
> > -- 
> > 2.24.1
> > 



  reply	other threads:[~2020-01-21  8:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-20 20:28 [meta-java][PATCH] java.bbclass: oe_makeclasspath does nothing without -s Davis, Michael
2020-01-21  6:44 ` Richard Leitner
2020-01-21  8:46   ` André Draszik [this message]
2020-01-21  8:57     ` Richard Leitner

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=bd94e91dbbfd01500f86432e1c30ee356bb85d12.camel@andred.net \
    --to=git@andred.net \
    --cc=michael.davis@essvote.com \
    --cc=openembedded-devel@lists.openembedded.org \
    --cc=richard.leitner@skidata.com \
    /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.