[oe] [meta-java][PATCH] java.bbclass: oe_makeclasspath does nothing without -s
André Draszik
git at andred.net
Tue Jan 21 08:46:29 UTC 2020
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 at 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
> >
More information about the Openembedded-devel
mailing list