From 157eface0aa778885484fbe4fc9a635f63b371b2 Mon Sep 17 00:00:00 2001 From: Jaap de Jong <jaap.dej...@nedap.com> Date: Tue, 28 Mar 2017 14:15:57 +0200 Subject: [PATCH 3/6] oracle-jse-ejre: Add recipe for arm softfloat jvm
--- .../oracle-jse-ejre-arm-sflt-client-headless.inc | 10 +++++++++ .../oracle-java/oracle-jse-jre_1.8.0.bb | 24 +++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 recipes-devtools/oracle-java/oracle-jse-ejre-arm-sflt-client-headless.inc diff --git a/recipes-devtools/oracle-java/oracle-jse-ejre-arm-sflt-client-headless.inc b/recipes-devtools/oracle-java/oracle-jse-ejre-arm-sflt-client-headless.inc new file mode 100644 index 0000000..321afee --- /dev/null +++ b/recipes-devtools/oracle-java/oracle-jse-ejre-arm-sflt-client-headless.inc @@ -0,0 +1,10 @@ +PV_UPDATE = "121" +BUILD_NUMBER = "13" +LICENSE_DIR = "ejdk${PV}_${PV_UPDATE}/linux_arm_sflt/jre" + +require oracle-jse-ejre.inc + +SRC_URI = "http://download.oracle.com/otn/java/ejdk/8u${PV_UPDATE}-b${BUILD_NUMBER}/e9e7ea248e2c4826b92b3f075a80e441/ejdk-8u${PV_UPDATE}-linux-arm-sflt.tar.gz" + +SRC_URI[md5sum] = "11041e7eedd897d70cabe54f29d10587" +SRC_URI[sha256sum] = "9ad72839dba09e336954c7653778a2517e6d0e56a9524f4c11ff008ad3eb4637" diff --git a/recipes-devtools/oracle-java/oracle-jse-jre_1.8.0.bb b/recipes-devtools/oracle-java/oracle-jse-jre_1.8.0.bb index 7c8e351..ebf0265 100644 --- a/recipes-devtools/oracle-java/oracle-jse-jre_1.8.0.bb +++ b/recipes-devtools/oracle-java/oracle-jse-jre_1.8.0.bb @@ -1,16 +1,20 @@ # Automatically choose java package based on target architecture def get_java_pkg(d): - TA = d.getVar('TARGET_ARCH', True) - if TA == "arm": - javaPkg = "oracle-jse-ejre-arm-vfp-hflt-client-headless" - elif TA == "i586": - javaPkg = "oracle-jse-jre-i586" - elif TA == "x86_64": - javaPkg = "oracle-jse-jre-x86-64" - else: - raise bb.parse.SkipPackage("Target architecture '%s' is not supported by the meta-oracle-java layer" %TA) + TA = d.getVar('TARGET_ARCH', True) + if TA == "arm": + FPU = d.getVar('TARGET_FPU', True) + if FPU == "soft": + javaPkg = "oracle-jse-ejre-arm-sflt-client-headless" + else: + javaPkg = "oracle-jse-ejre-arm-vfp-hflt-client-headless" + elif TA == "i586": + javaPkg = "oracle-jse-jre-i586" + elif TA == "x86_64": + javaPkg = "oracle-jse-jre-x86-64" + else: + raise bb.parse.SkipPackage("Target architecture '%s' is not supported by the meta-oracle-java layer" %TA) - return javaPkg + return javaPkg JAVA_PKG = "${@get_java_pkg(d)}" -- 2.7.4
-- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto