[yocto] [meta-oracle-java][PATCH] Update jdk and jre to version 67

Tue Aug 26 06:02:34 PDT 2014

-----Original Message-----
From: Martin Jansa [mailto:martin.jansa at gmail.com] 
Sent: Tuesday, August 26, 2014 2:07 PM
To: Vladimir Redzhepov
Cc: yocto at yoctoproject.org; Maxin B. John
Subject: Re: [meta-oracle-java][PATCH] Update jdk and jre to version 67

On Tue, Aug 26, 2014 at 10:39:43AM +0000, Vladimir Redzhepov wrote:
> From 27a16047d97c3c49f889ccf2a89895b98eb55a39 Mon Sep 17 00:00:00 2001
> From: Vladimir Redzhepov <vladimir_redzhepov at epam.com>
> Date: Tue, 26 Aug 2014 13:22:49 +0300
> Subject: [PATCH] Update jdk and jre to version 67
> 
> 1. Add BUILD_NUMBER variable.
> 2. Change SRC_URI for all recipes.
> 3. Recipe cleanup - remove redundant PR = "r0" from all recipes.
> 4. Update checksums for license files.
> 
> Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov at epam.com>
> ---
>  recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb   | 10 +++++-----
>  recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb | 10 +++++-----
>  recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb   | 10 +++++-----
>  recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb | 10 +++++-----
>  recipes-devtools/oracle-java/oracle-jse.inc                 |  4 ++--
>  5 files changed, 22 insertions(+), 22 deletions(-)
> 
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> index 978fbd5..0667161 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> @@ -1,9 +1,9 @@
> -PR = "r0"
> -PV_UPDATE = "25"
> +PV_UPDATE = "67"
> +BUILD_NUMBER = "01"
>  
>  require oracle-jse-jdk.inc
>  
> -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-linux-i586.tar.gz"
> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_NUMBER}/jdk-7u${PV_UPDATE}-linux-i586.tar.gz"
>  
> -SRC_URI[md5sum] = "23176d0ebf9dedd21e3150b4bb0ee776"
> -SRC_URI[sha256sum] = "dd89b20afa939992bb7fdc44837fa64f0a98d7ee1e5706fe8a2d9e2247ba6de7"
> +SRC_URI[md5sum] = "715b0e8ba2a06bded75f6a92427e2701"
> +SRC_URI[sha256sum] = "b6231064ad2c9fbbcb099dba17b1dcf12033e922b9c24e4348b9a01e9ebaa85c"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> index 7979401..f18ce55 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> @@ -1,9 +1,9 @@
> -PR = "r0"
> -PV_UPDATE = "25"
> +PV_UPDATE = "67"
> +BUILD_NUMBER = "01"
>  
>  require oracle-jse-jdk.inc
>  
> -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-linux-x64.tar.gz"
> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_NUMBER}/jdk-7u${PV_UPDATE}-linux-x64.tar.gz"
>  
> -SRC_URI[md5sum] = "83ba05e260813f7a9140b76e3d37ea33"
> -SRC_URI[sha256sum] = "f80dff0e19ca8d038cf7fe3aaa89538496b80950f4d10ff5f457988ae159b2a6"
> +SRC_URI[md5sum] = "81e3e2df33e13781e5fac5756ed90e67"
> +SRC_URI[sha256sum] = "54dd1e13edf18c64941a55da9c91210b53dc5cf48f1a8f4538c863049e346335"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb
> index 6125025..d0a9300 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb
> +++ b/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb
> @@ -1,9 +1,9 @@
> -PR = "r0"
> -PV_UPDATE = "25"
> +PV_UPDATE = "67"
> +BUILD_NUMBER = "01"
>  
>  require oracle-jse-jre.inc
>  
> -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jre-7u25-linux-i586.tar.gz"
> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_NUMBER}/jre-7u${PV_UPDATE}-linux-i586.tar.gz"
>  
> -SRC_URI[md5sum] = "0e9ccefe49e937e592dbb605f2e8e7d8"
> -SRC_URI[sha256sum] = "4016965536d8607743267812ab04e6d428036dda432893748c1df6cb77b09628"
> +SRC_URI[md5sum] = "2a256eb2a91f0084e58c612636342c2b"
> +SRC_URI[sha256sum] = "eadec83a54d3a9d09248a8d16b21c03da9afffc7317e775fb8db962620a0781d"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb
> index 4058d23..0d5f157 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb
> +++ b/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb
> @@ -1,9 +1,9 @@
> -PR = "r0"
> -PV_UPDATE = "25"
> +PV_UPDATE = "67"
> +BUILD_NUMBER = "01"
>  
>  require oracle-jse-jre.inc
>  
> -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jre-7u25-linux-x64.tar.gz"
> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_NUMBER}/jre-7u${PV_UPDATE}-linux-x64.tar.gz"
>  
> -SRC_URI[md5sum] = "743ee0ebf73ce428c912866d84e374e0"
> -SRC_URI[sha256sum] = "3c4496316fb413d5ab0590e9971676a521b9a600b3ceaac311f04c18c98a98c0"
> +SRC_URI[md5sum] = "9007c79167be0177fb47e5313c53d5cb"
> +SRC_URI[sha256sum] = "726c37c07bb389b5b96674b7bcbc288e39fb8fbcd42369afa364a18e66248b1f"
> diff --git a/recipes-devtools/oracle-java/oracle-jse.inc b/recipes-devtools/oracle-java/oracle-jse.inc
> index 3a4e20d..38ceef0 100644
> --- a/recipes-devtools/oracle-java/oracle-jse.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse.inc
> @@ -2,8 +2,8 @@ LICENSE_FLAGS = "oracle_java"
>  LICENSE = "Oracle_Binary_Code_License_Agreement"
>  LIC_FILES_CHKSUM = "\
>  	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/LICENSE;md5=98f46ab6481d87c4d77e0e91a6dbc15f \
> -	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=3a11238025bf13b87f04753183ffeb90 \
> -	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=c339b34e3da6673d2c5950d0f8808f8c \
> +	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
> +	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
>  	"

Please describe the changes in commit message (it was requested in
previous patch sets).

	I remember about it and in this patch I've added the changes:
	> 1. Add BUILD_NUMBER variable.
	> 2. Change SRC_URI for all recipes.
	> 3. Recipe cleanup - remove redundant PR = "r0" from all recipes.
	> 4. Update checksums for license files.

Also LIC_FILES_CHKSUM paths can be relative to ${S}, which is set to
WORKDIR in the .inc files, so you should be able to just drop
""${WORKDIR}/" here.

	Yes, I agree. I've just removed "${WORKDIR}/" from LIC_FILES_CHKSUM.

One last comment, while reading .inc file I've noticed:
# get the java update version in the resulting package
PR =. "u${PV_UPDATE}"

Would it make sense to append it to PV instead?

	Maybe. Could you please show me how to implement your idea?

Maybe easier to read with recipes renamed from _1.7.0.bb to _1.7.bb.

	Yes, I agree with you. I'll rename them.

Thanks

>  FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
> -- 
> 2.1.0
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com