]> code.ossystems Code Review - openembedded-core.git/commitdiff
base.bbclass: Make .jar file depend on unzip-native
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Tue, 18 Jul 2017 11:01:53 +0000 (13:01 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 21 Jul 2017 21:45:20 +0000 (22:45 +0100)
Unzip is required for jar files. Without this patch:
ERROR: junit4-4.3.1-r0 do_unpack: Unpack failure for URL:
'http://downloads.sourceforge.net/junit/junit-4.3.1-src.jar'. Unpack
command
PATH="/var/lib/jenkins/workspace/qt5122-dyspro/build/tmp/sysroots-uninative/x86_64-linux/usr/bin ......."
unzip -q -o '/var/lib/yocto/downloads/junit-4.3.1-src.jar' failed with
return value 127

Suggested-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/base.bbclass

index 9c40e017f4e302ff67103853a2844929fecbc649..8c8697761c7e99342bd6eb28c508ad7cf3444897 100644 (file)
@@ -628,7 +628,7 @@ python () {
             d.appendVarFlag('do_unpack', 'depends', ' xz-native:do_populate_sysroot')
 
         # .zip should DEPEND on unzip-native for unpacking
-        elif path.endswith('.zip'):
+        elif path.endswith('.zip') or path.endswith('.jar'):
             d.appendVarFlag('do_unpack', 'depends', ' unzip-native:do_populate_sysroot')
 
         # file is needed by rpm2cpio.sh