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.da...@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
+ classpath=$classpath$delimiter$file
+ delimiter=":"
fi
;;
--
2.24.1
Disclaimer
The information contained in this communication from the sender is
confidential. It is intended solely for use by the recipient and others
authorized to receive it. If you are not the recipient, you are hereby notified
that any disclosure, copying, distribution or taking action in relation of the
contents of this information is strictly prohibited and may be unlawful.
This email has been scanned for viruses and malware, and may have been
automatically archived by Mimecast Ltd, an innovator in Software as a Service
(SaaS) for business. Providing a safer and more useful place for your human
generated data. Specializing in; Security, archiving and compliance. To find
out more visit the Mimecast website.
--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
