aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavis, Michael <michael.davis@essvote.com>2020-01-20 20:28:31 +0000
committerRichard Leitner <richard.leitner@skidata.com>2020-01-21 07:37:04 +0100
commit2a7b02e9a563f70d4ae1aa6cc44d50490168cc87 (patch)
tree7cff6226eb6b77ba9c65e0748b96677ea0ac7c1b
parentc34172c39e037e2c4dadc1b9e77522ffa158ba2c (diff)
downloadmeta-java-2a7b02e9a563f70d4ae1aa6cc44d50490168cc87.tar.gz
meta-java-2a7b02e9a563f70d4ae1aa6cc44d50490168cc87.tar.bz2
meta-java-2a7b02e9a563f70d4ae1aa6cc44d50490168cc87.zip
java.bbclass: oe_makeclasspath does nothing without -s
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> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r--classes/java.bbclass10
1 files 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
;;