From 92b9bdd41469016d36540bf16aea6358cce99126 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Tue, 31 Mar 2015 15:57:06 -0500 Subject: icedtea6, openjdk-6: remove currency data generation expiration date --- ...njdk-remove-currency-data-generation-expi.patch | 25 ++++++++++++++++++++++ .../icedtea6-native_1.8.11.bbappend | 4 +++- ...njdk-remove-currency-data-generation-expi.patch | 25 ++++++++++++++++++++++ .../meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend | 5 ++++- 4 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 multitech/recipes/meta-java-fixes/icedtea6-native-1.8.11/icedtea-openjdk-remove-currency-data-generation-expi.patch create mode 100644 multitech/recipes/meta-java-fixes/openjdk-6-6b24/icedtea-openjdk-remove-currency-data-generation-expi.patch diff --git a/multitech/recipes/meta-java-fixes/icedtea6-native-1.8.11/icedtea-openjdk-remove-currency-data-generation-expi.patch b/multitech/recipes/meta-java-fixes/icedtea6-native-1.8.11/icedtea-openjdk-remove-currency-data-generation-expi.patch new file mode 100644 index 0000000..6dd36af --- /dev/null +++ b/multitech/recipes/meta-java-fixes/icedtea6-native-1.8.11/icedtea-openjdk-remove-currency-data-generation-expi.patch @@ -0,0 +1,25 @@ +From 7df2fd1014a0c31f518be4f6a0018533f469d584 Mon Sep 17 00:00:00 2001 +From: Alex Gonzalez +Date: Wed, 31 Dec 2014 16:07:32 +0100 +Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration + date + +Signed-off-by: Alex Gonzalez +--- + .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 --- + 1 file changed, 3 deletions(-) + +diff --git openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java +index bf335fa22c1d..0e421360fef9 100644 +--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java ++++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java +@@ -281,9 +281,6 @@ public class GenerateCurrencyData { + checkCurrencyCode(newCurrency); + String timeString = currencyInfo.substring(4, length - 4); + long time = format.parse(timeString).getTime(); +- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { +- throw new RuntimeException("time is more than 10 years from present: " + time); +- } + specialCaseCutOverTimes[specialCaseCount] = time; + specialCaseOldCurrencies[specialCaseCount] = oldCurrency; + specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency); diff --git a/multitech/recipes/meta-java-fixes/icedtea6-native_1.8.11.bbappend b/multitech/recipes/meta-java-fixes/icedtea6-native_1.8.11.bbappend index 24e779d..3da385b 100644 --- a/multitech/recipes/meta-java-fixes/icedtea6-native_1.8.11.bbappend +++ b/multitech/recipes/meta-java-fixes/icedtea6-native_1.8.11.bbappend @@ -1,7 +1,9 @@ FILESEXTRA := "${THISDIR}" FILESPATHBASE =. "${FILESEXTRA}:" -PR .= ".corecdp1" +PR .= ".corecdp2" SRC_URI += "file://icedtea-jdk-avoid-cdef-collision.patch;apply=no" +SRC_URI += "file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no" DISTRIBUTION_PATCHES += "patches/icedtea-jdk-avoid-cdef-collision.patch" +DISTRIBUTION_PATCHES += "patches/icedtea-openjdk-remove-currency-data-generation-expi.patch" diff --git a/multitech/recipes/meta-java-fixes/openjdk-6-6b24/icedtea-openjdk-remove-currency-data-generation-expi.patch b/multitech/recipes/meta-java-fixes/openjdk-6-6b24/icedtea-openjdk-remove-currency-data-generation-expi.patch new file mode 100644 index 0000000..6dd36af --- /dev/null +++ b/multitech/recipes/meta-java-fixes/openjdk-6-6b24/icedtea-openjdk-remove-currency-data-generation-expi.patch @@ -0,0 +1,25 @@ +From 7df2fd1014a0c31f518be4f6a0018533f469d584 Mon Sep 17 00:00:00 2001 +From: Alex Gonzalez +Date: Wed, 31 Dec 2014 16:07:32 +0100 +Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration + date + +Signed-off-by: Alex Gonzalez +--- + .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 --- + 1 file changed, 3 deletions(-) + +diff --git openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java +index bf335fa22c1d..0e421360fef9 100644 +--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java ++++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java +@@ -281,9 +281,6 @@ public class GenerateCurrencyData { + checkCurrencyCode(newCurrency); + String timeString = currencyInfo.substring(4, length - 4); + long time = format.parse(timeString).getTime(); +- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { +- throw new RuntimeException("time is more than 10 years from present: " + time); +- } + specialCaseCutOverTimes[specialCaseCount] = time; + specialCaseOldCurrencies[specialCaseCount] = oldCurrency; + specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency); diff --git a/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend b/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend index 71bd52e..e5595b9 100644 --- a/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend +++ b/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend @@ -3,10 +3,13 @@ FILESEXTRA := "${THISDIR}" FILESPATH =. "${FILESEXTRA}/openjdk-6-6b24:" -PR .= ".corecdp1" +PR .= ".corecdp2" # skip building shark WITH_ADDITIONAL_VMS = "cacao,jamvm" # don't need llvm if we aren't building shark DEPENDS := "${@bb.data.getVar('DEPENDS',d,1).replace(' llvm2.8 ',' ')}" + +ICEDTEAPATCHES += "file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no" +DISTRIBUTION_PATCHES += "patches/icedtea-openjdk-remove-currency-data-generation-expi.patch" -- cgit v1.2.3