* [meta-oracle-java][PATCH] Update jdk and jre to version 67
@ 2014-08-26 10:39 Vladimir Redzhepov
2014-08-26 11:07 ` Martin Jansa
0 siblings, 1 reply; 12+ messages in thread
From: Vladimir Redzhepov @ 2014-08-26 10:39 UTC (permalink / raw)
To: yocto
From 27a16047d97c3c49f889ccf2a89895b98eb55a39 Mon Sep 17 00:00:00 2001
From: Vladimir Redzhepov <vladimir_redzhepov@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@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 \
"
FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
--
2.1.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] Update jdk and jre to version 67
2014-08-26 10:39 [meta-oracle-java][PATCH] Update jdk and jre to version 67 Vladimir Redzhepov
@ 2014-08-26 11:07 ` Martin Jansa
2014-08-26 13:02 ` Vladimir Redzhepov
0 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2014-08-26 11:07 UTC (permalink / raw)
To: Vladimir Redzhepov; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 6487 bytes --]
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@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@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).
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.
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 easier to read with recipes renamed from _1.7.0.bb to _1.7.bb.
Thanks
> FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
> --
> 2.1.0
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] Update jdk and jre to version 67
2014-08-26 11:07 ` Martin Jansa
@ 2014-08-26 13:02 ` Vladimir Redzhepov
2014-08-26 13:42 ` Martin Jansa
0 siblings, 1 reply; 12+ messages in thread
From: Vladimir Redzhepov @ 2014-08-26 13:02 UTC (permalink / raw)
To: Martin Jansa; +Cc: yocto
-----Original Message-----
From: Martin Jansa [mailto:martin.jansa@gmail.com]
Sent: Tuesday, August 26, 2014 2:07 PM
To: Vladimir Redzhepov
Cc: yocto@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@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@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@gmail.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] Update jdk and jre to version 67
2014-08-26 13:02 ` Vladimir Redzhepov
@ 2014-08-26 13:42 ` Martin Jansa
2014-09-03 14:08 ` Vladimir Redzhepov
0 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2014-08-26 13:42 UTC (permalink / raw)
To: Vladimir Redzhepov; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 7788 bytes --]
On Tue, Aug 26, 2014 at 01:02:34PM +0000, Vladimir Redzhepov wrote:
>
>
> -----Original Message-----
> From: Martin Jansa [mailto:martin.jansa@gmail.com]
> Sent: Tuesday, August 26, 2014 2:07 PM
> To: Vladimir Redzhepov
> Cc: yocto@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@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@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.
Ah I see, but me and Khem meant the changes in COPYRIGHT,
THIRDPARTYLICENSEREADME.txt, you've sent them in separate e-mail, but it
should be described in commit message.
> 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?
PV =. "u${PV_UPDATE}"
>
> 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
BTW: your e-mail client doesn't distinguish your text from the text
you're replying to (mine). It's very hard to read.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] Update jdk and jre to version 67
2014-08-26 13:42 ` Martin Jansa
@ 2014-09-03 14:08 ` Vladimir Redzhepov
0 siblings, 0 replies; 12+ messages in thread
From: Vladimir Redzhepov @ 2014-09-03 14:08 UTC (permalink / raw)
To: Martin Jansa; +Cc: yocto
> -----Original Message-----
> From: Martin Jansa [mailto:martin.jansa@gmail.com]
> Sent: Tuesday, August 26, 2014 4:43 PM
> To: Vladimir Redzhepov
> Cc: yocto@yoctoproject.org; Maxin B. John
> Subject: Re: [meta-oracle-java][PATCH] Update jdk and jre to version 67
>
> On Tue, Aug 26, 2014 at 01:02:34PM +0000, Vladimir Redzhepov wrote:
> >
> >
> > -----Original Message-----
> > From: Martin Jansa [mailto:martin.jansa@gmail.com]
> > Sent: Tuesday, August 26, 2014 2:07 PM
> > To: Vladimir Redzhepov
> > Cc: yocto@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@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@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=9
> 8f46ab6481d87c4d77e0e91a6dbc15f \
> > > -
> file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md
> 5=3a11238025bf13b87f04753183ffeb90 \
> > > -
> file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLIC
> ENSEREADME.txt;md5=c339b34e3da6673d2c5950d0f8808f8c \
> > > +
> file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md
> 5=be9fe5d47a7dcfb78f142f487afb34bb \
> > > +
> file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLIC
> ENSEREADME.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.
>
> Ah I see, but me and Khem meant the changes in COPYRIGHT,
> THIRDPARTYLICENSEREADME.txt, you've sent them in separate e-mail, but it
> should be described in commit message.
>
> > 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?
>
> PV =. "u${PV_UPDATE}"
>
> >
> > 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
>
> BTW: your e-mail client doesn't distinguish your text from the text
> you're replying to (mine). It's very hard to read.
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
Hi Martin,
I took into account your remark about my e-mail client so I fixed it. I added changes in COPYRIGHT and THIRDPARTYLICENSEREADME.txt into the commit message. I tried to rename recipes from _1.7.0.bb to _1.7.bb and make PV =. "u${PV_UPDATE}" as you said above but I've got errors. I need time to figure out what was wrong. Removing "${WORKDIR}/" from LIC_FILES_CHKSUM seems working but I didn't include this change into the current patch.
In my mind this several improvements:
1. Rename recipes from _1.7.0.bb to _1.7.
2. Make PV =. "u${PV_UPDATE}" instead of PR =. "u${PV_UPDATE}"
3. Removing "${WORKDIR}/"
after additional investigation could be included to the next patch. What do you think?
Here is my final patch for review
From 6562802db9b4ad5be2f5e0af8dec639d3322476b Mon Sep 17 00:00:00 2001
From: Vladimir Redzhepov <vladimir_redzhepov@epam.com>
Date: Tue, 26 Aug 2014 13:22:49 +0300
Subject: [PATCH] Update jdk and jre to version 67
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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.
diff -u jre1.7.0_25/COPYRIGHT jre1.7.0_67/COPYRIGHT
--- jre1.7.0_25/COPYRIGHT 2013-06-06 07:12:23.000000000 +0300
+++ jre1.7.0_67/COPYRIGHT 2014-07-25 19:07:26.000000000 +0300
@@ -1,4 +1,4 @@
-Copyright � 1993, 2013, Oracle and/or its affiliates.
+Copyright � 1993, 2014, Oracle and/or its affiliates.
All rights reserved.
diff -u jre1.7.0_25/THIRDPARTYLICENSEREADME.txt jre1.7.0_67/THIRDPARTYLICENSEREADME.txt
--- jre1.7.0_25/THIRDPARTYLICENSEREADME.txt 2013-06-06 07:12:23.000000000 +0300
+++ jre1.7.0_67/THIRDPARTYLICENSEREADME.txt 2014-07-25 19:07:26.000000000 +0300
@@ -1912,6 +1912,35 @@
-------------------------------------------------------------------------------
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
%% Portions licensed from Taligent, Inc.
-------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
%% This notice is provided with respect to the following which is
included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
- Apache Derby 10.8.1.2 [included with JDK 7 only]
+ Apache Derby 10.8.3.0 [included with JDK 7 only]
Apache Jakarta BCEL 5.2
Apache Jakarta Regexp 1.4
Apache Santuario XMLSec-Java 1.4.2
Apache Xalan-Java 2.7.1
- Apache Xerces2 Java 2.10.0
+ Apache Xerces2 Java 2.11.0
Apache XML Resolver 1.1
Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov@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 \
"
FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
--
2.1.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] update jdk and jre to version 67
2014-08-25 13:00 ` Vladimir Redzhepov
@ 2014-08-25 13:30 ` Martin Jansa
0 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2014-08-25 13:30 UTC (permalink / raw)
To: Vladimir Redzhepov; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 7543 bytes --]
On Mon, Aug 25, 2014 at 01:00:08PM +0000, Vladimir Redzhepov wrote:
>
>
> -----Original Message-----
> From: Martin Jansa [mailto:martin.jansa@gmail.com]
> Sent: Thursday, August 21, 2014 8:23 PM
> To: Vladimir Redzhepov
> Cc: yocto@yoctoproject.org
> Subject: Re: [yocto] [meta-oracle-java][PATCH] update jdk and jre to version 67
>
> On Thu, Aug 21, 2014 at 05:01:47PM +0000, Vladimir Redzhepov wrote:
> > From f0305398a51435f407e41a8f0eaf83f8bdd13cca Mon Sep 17 00:00:00 2001
> > From: Vladimir Redzhepov <vladimir_redzhepov@epam.com>
> > Date: Thu, 21 Aug 2014 19:43:29 +0300
> > Subject: [PATCH] update jdk and jre to version 67
> >
> > Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov@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..07fa39b 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"
> > +PR = "r1"
> > +PV_UPDATE = "67"
>
> Does it need PR update?
>
> I thought that PR should be updated each time we modify recipe. That's why I've updated it.
We have automated PR service for that
https://wiki.yoctoproject.org/wiki/PR_Service
so please drop PR variable instead.
> > 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/7u67-b01/jdk-7u67-linux-i586.tar.gz"
>
> It would be better to use PV_UPDATE variable here and maybe introduce
> another one for build number?
>
> Do you mean using PV_UPDATE in SRC_URI like this
> SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${ PV_UPDATE }-b01/jdk-7u${ PV_UPDATE }-linux-i586.tar.gz" ?
>
> Of course we can use additional variable for build number, for example BUILD_NUM = "b01"
> SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${ PV_UPDATE }-${BUILD_NUM}/jdk-7u${ PV_UPDATE }-linux-i586.tar.gz"
>
Yes, that's what I meant (without the spaces around PV_UPDATE), that way
it's easier to see what was changed in recipe when reviewing updates like this.
> > -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..8bad119 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"
> > +PR = "r1"
> > +PV_UPDATE = "67"
> > 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/7u67-b01/jdk-7u67-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..4165d74 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"
> > +PR = "r1"
> > +PV_UPDATE = "67"
> > 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/7u67-b01/jre-7u67-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..a1474a9 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"
> > +PR = "r1"
> > +PV_UPDATE = "67"
> > 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/7u67-b01/jre-7u67-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 mention in commit message what was changed in it.
>
> It would be nice to use consistent whitespace for indentation.
I've seen your reply to Khem, but it should be in commit message.
>
> > "
> > FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
> > --
> > 2.1.0
> >
>
> > --
> > _______________________________________________
> > yocto mailing list
> > yocto@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/yocto
>
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] update jdk and jre to version 67
2014-08-21 17:22 ` Martin Jansa
@ 2014-08-25 13:00 ` Vladimir Redzhepov
2014-08-25 13:30 ` Martin Jansa
0 siblings, 1 reply; 12+ messages in thread
From: Vladimir Redzhepov @ 2014-08-25 13:00 UTC (permalink / raw)
To: Martin Jansa; +Cc: yocto
-----Original Message-----
From: Martin Jansa [mailto:martin.jansa@gmail.com]
Sent: Thursday, August 21, 2014 8:23 PM
To: Vladimir Redzhepov
Cc: yocto@yoctoproject.org
Subject: Re: [yocto] [meta-oracle-java][PATCH] update jdk and jre to version 67
On Thu, Aug 21, 2014 at 05:01:47PM +0000, Vladimir Redzhepov wrote:
> From f0305398a51435f407e41a8f0eaf83f8bdd13cca Mon Sep 17 00:00:00 2001
> From: Vladimir Redzhepov <vladimir_redzhepov@epam.com>
> Date: Thu, 21 Aug 2014 19:43:29 +0300
> Subject: [PATCH] update jdk and jre to version 67
>
> Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov@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..07fa39b 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"
> +PR = "r1"
> +PV_UPDATE = "67"
Does it need PR update?
I thought that PR should be updated each time we modify recipe. That's why I've updated it.
> 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/7u67-b01/jdk-7u67-linux-i586.tar.gz"
It would be better to use PV_UPDATE variable here and maybe introduce
another one for build number?
Do you mean using PV_UPDATE in SRC_URI like this
SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${ PV_UPDATE }-b01/jdk-7u${ PV_UPDATE }-linux-i586.tar.gz" ?
Of course we can use additional variable for build number, for example BUILD_NUM = "b01"
SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${ PV_UPDATE }-${BUILD_NUM}/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..8bad119 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"
> +PR = "r1"
> +PV_UPDATE = "67"
> 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/7u67-b01/jdk-7u67-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..4165d74 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"
> +PR = "r1"
> +PV_UPDATE = "67"
> 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/7u67-b01/jre-7u67-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..a1474a9 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"
> +PR = "r1"
> +PV_UPDATE = "67"
> 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/7u67-b01/jre-7u67-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 mention in commit message what was changed in it.
It would be nice to use consistent whitespace for indentation.
> "
> FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
> --
> 2.1.0
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] update jdk and jre to version 67
2014-08-25 6:40 ` Khem Raj
@ 2014-08-25 12:08 ` Vladimir Redzhepov
0 siblings, 0 replies; 12+ messages in thread
From: Vladimir Redzhepov @ 2014-08-25 12:08 UTC (permalink / raw)
To: Khem Raj; +Cc: yocto
diff -u jre1.7.0_25/COPYRIGHT jre1.7.0_67/COPYRIGHT
--- jre1.7.0_25/COPYRIGHT 2013-06-06 07:12:23.000000000 +0300
+++ jre1.7.0_67/COPYRIGHT 2014-07-25 19:07:26.000000000 +0300
@@ -1,4 +1,4 @@
-Copyright � 1993, 2013, Oracle and/or its affiliates.
+Copyright � 1993, 2014, Oracle and/or its affiliates.
All rights reserved.
diff -u jre1.7.0_25/THIRDPARTYLICENSEREADME.txt jre1.7.0_67/THIRDPARTYLICENSEREADME.txt
--- jre1.7.0_25/THIRDPARTYLICENSEREADME.txt 2013-06-06 07:12:23.000000000 +0300
+++ jre1.7.0_67/THIRDPARTYLICENSEREADME.txt 2014-07-25 19:07:26.000000000 +0300
@@ -1912,6 +1912,35 @@
-------------------------------------------------------------------------------
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
%% Portions licensed from Taligent, Inc.
-------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
%% This notice is provided with respect to the following which is
included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
- Apache Derby 10.8.1.2 [included with JDK 7 only]
+ Apache Derby 10.8.3.0 [included with JDK 7 only]
Apache Jakarta BCEL 5.2
Apache Jakarta Regexp 1.4
Apache Santuario XMLSec-Java 1.4.2
Apache Xalan-Java 2.7.1
- Apache Xerces2 Java 2.10.0
+ Apache Xerces2 Java 2.11.0
Apache XML Resolver 1.1
-----Original Message-----
From: Khem Raj [mailto:raj.khem@gmail.com]
Sent: Monday, August 25, 2014 9:41 AM
To: Vladimir Redzhepov
Cc: yocto@yoctoproject.org
Subject: Re: [yocto] [meta-oracle-java][PATCH] update jdk and jre to version 67
On 14-08-21 17:01:47, Vladimir Redzhepov wrote:
> From f0305398a51435f407e41a8f0eaf83f8bdd13cca Mon Sep 17 00:00:00 2001
> From: Vladimir Redzhepov <vladimir_redzhepov@epam.com>
> Date: Thu, 21 Aug 2014 19:43:29 +0300
> Subject: [PATCH] update jdk and jre to version 67
>
> Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov@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.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 \
> "
what changed in these files that ensues change in checksums ?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] update jdk and jre to version 67
2014-08-21 17:01 [meta-oracle-java][PATCH] update " Vladimir Redzhepov
2014-08-21 17:22 ` Martin Jansa
2014-08-21 19:19 ` Maxin B. John
@ 2014-08-25 6:40 ` Khem Raj
2014-08-25 12:08 ` Vladimir Redzhepov
2 siblings, 1 reply; 12+ messages in thread
From: Khem Raj @ 2014-08-25 6:40 UTC (permalink / raw)
To: Vladimir Redzhepov; +Cc: yocto
On 14-08-21 17:01:47, Vladimir Redzhepov wrote:
> From f0305398a51435f407e41a8f0eaf83f8bdd13cca Mon Sep 17 00:00:00 2001
> From: Vladimir Redzhepov <vladimir_redzhepov@epam.com>
> Date: Thu, 21 Aug 2014 19:43:29 +0300
> Subject: [PATCH] update jdk and jre to version 67
>
> Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov@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.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 \
> "
what changed in these files that ensues change in checksums ?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] update jdk and jre to version 67
2014-08-21 17:01 [meta-oracle-java][PATCH] update " Vladimir Redzhepov
2014-08-21 17:22 ` Martin Jansa
@ 2014-08-21 19:19 ` Maxin B. John
2014-08-25 6:40 ` Khem Raj
2 siblings, 0 replies; 12+ messages in thread
From: Maxin B. John @ 2014-08-21 19:19 UTC (permalink / raw)
To: Vladimir Redzhepov; +Cc: yocto
Hi Vladimir,
On Thu, Aug 21, 2014 at 05:01:47PM +0000, Vladimir Redzhepov wrote:
> From f0305398a51435f407e41a8f0eaf83f8bdd13cca Mon Sep 17 00:00:00 2001
>
> From: Vladimir Redzhepov <vladimir_redzhepov@epam.com>
>
> Date: Thu, 21 Aug 2014 19:43:29 +0300
>
> Subject: [PATCH] update jdk and jre to version 67
>
>
>
> Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov@epam.com>
>
> ---
> recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb | 10 +++++-----
<snip>
In addition to Martin's review comments, patch doesn't seems to apply properly:
Applying: update jdk and jre to version 67
fatal: corrupt patch at line 27
Patch failed at 0001 update jdk and jre to version 67
Best Regards,
Maxin
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-oracle-java][PATCH] update jdk and jre to version 67
2014-08-21 17:01 [meta-oracle-java][PATCH] update " Vladimir Redzhepov
@ 2014-08-21 17:22 ` Martin Jansa
2014-08-25 13:00 ` Vladimir Redzhepov
2014-08-21 19:19 ` Maxin B. John
2014-08-25 6:40 ` Khem Raj
2 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2014-08-21 17:22 UTC (permalink / raw)
To: Vladimir Redzhepov; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 6041 bytes --]
On Thu, Aug 21, 2014 at 05:01:47PM +0000, Vladimir Redzhepov wrote:
> From f0305398a51435f407e41a8f0eaf83f8bdd13cca Mon Sep 17 00:00:00 2001
> From: Vladimir Redzhepov <vladimir_redzhepov@epam.com>
> Date: Thu, 21 Aug 2014 19:43:29 +0300
> Subject: [PATCH] update jdk and jre to version 67
>
> Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov@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..07fa39b 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"
> +PR = "r1"
> +PV_UPDATE = "67"
Does it need PR update?
> 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/7u67-b01/jdk-7u67-linux-i586.tar.gz"
It would be better to use PV_UPDATE variable here and maybe introduce
another one for build number?
> -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..8bad119 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"
> +PR = "r1"
> +PV_UPDATE = "67"
> 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/7u67-b01/jdk-7u67-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..4165d74 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"
> +PR = "r1"
> +PV_UPDATE = "67"
> 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/7u67-b01/jre-7u67-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..a1474a9 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"
> +PR = "r1"
> +PV_UPDATE = "67"
> 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/7u67-b01/jre-7u67-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 mention in commit message what was changed in it.
It would be nice to use consistent whitespace for indentation.
> "
> FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
> --
> 2.1.0
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [meta-oracle-java][PATCH] update jdk and jre to version 67
@ 2014-08-21 17:01 Vladimir Redzhepov
2014-08-21 17:22 ` Martin Jansa
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Vladimir Redzhepov @ 2014-08-21 17:01 UTC (permalink / raw)
To: yocto
[-- Attachment #1: Type: text/plain, Size: 5297 bytes --]
From f0305398a51435f407e41a8f0eaf83f8bdd13cca Mon Sep 17 00:00:00 2001
From: Vladimir Redzhepov <vladimir_redzhepov@epam.com>
Date: Thu, 21 Aug 2014 19:43:29 +0300
Subject: [PATCH] update jdk and jre to version 67
Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov@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..07fa39b 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"
+PR = "r1"
+PV_UPDATE = "67"
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/7u67-b01/jdk-7u67-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..8bad119 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"
+PR = "r1"
+PV_UPDATE = "67"
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/7u67-b01/jdk-7u67-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..4165d74 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"
+PR = "r1"
+PV_UPDATE = "67"
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/7u67-b01/jre-7u67-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..a1474a9 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"
+PR = "r1"
+PV_UPDATE = "67"
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/7u67-b01/jre-7u67-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 \
"
FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
--
2.1.0
[-- Attachment #2: Type: text/html, Size: 12689 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-09-03 14:08 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-26 10:39 [meta-oracle-java][PATCH] Update jdk and jre to version 67 Vladimir Redzhepov
2014-08-26 11:07 ` Martin Jansa
2014-08-26 13:02 ` Vladimir Redzhepov
2014-08-26 13:42 ` Martin Jansa
2014-09-03 14:08 ` Vladimir Redzhepov
-- strict thread matches above, loose matches on Subject: below --
2014-08-21 17:01 [meta-oracle-java][PATCH] update " Vladimir Redzhepov
2014-08-21 17:22 ` Martin Jansa
2014-08-25 13:00 ` Vladimir Redzhepov
2014-08-25 13:30 ` Martin Jansa
2014-08-21 19:19 ` Maxin B. John
2014-08-25 6:40 ` Khem Raj
2014-08-25 12:08 ` Vladimir Redzhepov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.