Skip to contentSkip to conversation

oracle-jse.inc: Make LIC_FILES_CHKSUM path relative

PATCH In review Ricardo Ribalda Delgado 2 participants 4 messages Oct 14, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 oracle-jse.inc: Make LIC_FILES_CHKSUM path relative

If the path is absolute, it invalidates the SSTATE, which also invalidates all the recipes depending on this package.

---
 recipes-devtools/oracle-java/oracle-jse.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-devtools/oracle-java/oracle-jse.inc +3 -3
index e657a45d9105..6219d0081bb3 100644
@@ -1,9 +1,9 @@
 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=be9fe5d47a7dcfb78f142f487afb34bb \
-	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
+	file://${JDK_JRE}${PV}_${PV_UPDATE}/LICENSE;md5=98f46ab6481d87c4d77e0e91a6dbc15f \
+	file://${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
+	file://${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
 	"
 
 FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
Signature · 1 line
2.6.1
#1 lore raw

PATCH 2/2 oracle-jse-ejre.inc: Make LIC_FILES_CHKSUM path relative

If the path is absolute, it invalidates the SSTATE, which also invalidates all the recipes depending on this package.

---
 recipes-devtools/oracle-java/oracle-jse-ejre.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-devtools/oracle-java/oracle-jse-ejre.inc +2 -2
index 9a1fdfed2d98..65de848aea4c 100644
@@ -12,6 +12,6 @@ JDK_JRE = "ejre"
 require oracle-jse.inc
 
 LIC_FILES_CHKSUM = "\
-       file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
-       file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
+       file://${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
+       file://${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
        "
Signature · 1 line
2.6.1
#2 lore raw

PATCH 1/1 oracle-jse-ejre.inc: Make LIC_FILES_CHKSUM path relative

In reply to Ricardo Ribalda Delgado

If the path is absolute, it invalidates the SSTATE, which also invalidates all the recipes depending on this package.

---
 recipes-devtools/oracle-java/oracle-jse-ejre.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-devtools/oracle-java/oracle-jse-ejre.inc +2 -2
index 9a1fdfed2d98..65de848aea4c 100644
@@ -12,6 +12,6 @@ JDK_JRE = "ejre"
 require oracle-jse.inc
 
 LIC_FILES_CHKSUM = "\
-       file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
-       file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
+       file://${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
+       file://${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
        "
Signature · 1 line
2.6.1
#3 lore raw
In reply to Ricardo Ribalda Delgado
Quoted 14 lines · Ricardo Ribalda Delgado

If the path is absolute, it invalidates the SSTATE, which also invalidates all the recipes depending on this package.

---
 recipes-devtools/oracle-java/oracle-jse.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-devtools/oracle-java/oracle-jse.inc +0 -0
index e657a45d9105..6219d0081bb3 100644
@@ -1,9 +1,9 @@
 LICENSE_FLAGS = "oracle_java"
 LICENSE = "Oracle_Binary_Code_License_Agreement"

recipes-devtools/oracle-java/oracle-jse.inc line 9

Quoted 10 lines
recipes-devtools/oracle-java/oracle-jse.inc +3 -3
 LIC_FILES_CHKSUM = "\
-	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/LICENSE;md5=98f46ab6481d87c4d77e0e91a6dbc15f \
-	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
-	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
+	file://${JDK_JRE}${PV}_${PV_UPDATE}/LICENSE;md5=98f46ab6481d87c4d77e0e91a6dbc15f \
+	file://${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
+	file://${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
 	"
 
 FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "

Pushed these two patches now. Thanks.

Best Regards,
Maxin