openjdk-8: Upgrade from u72 to u102
PATCH v2 1/2 openjdk-8: Upgrade from u72 to u102
Openjdk is upgraded from u72 to u102. Two patches are dropped, as these were backports and the fixes are present in the current version. One patch was refreshed. One patch was backported from the upcoming u112 to fix a zero mode crash.
---
recipes-core/openjdk/openjdk-8-native_102b14.bb | 2 +
recipes-core/openjdk/openjdk-8-native_72b05.bb | 2 -
...ease-72b05.inc => openjdk-8-release-102b14.inc} | 51 +-
.../{openjdk-8_72b05.bb => openjdk-8_102b14.bb} | 4 +-
.../{openjre-8_72b05.bb => openjre-8_102b14.bb} | 4 +-
.../openjdk8-avoid-early-ldflags-expansion.patch | 53 -
.../openjdk8-fix-shark-stdc++11.patch | 2623 ++++++++++----------
.../openjdk8-fix-zero-mode-crash.patch | 49 +
..._than_returning_address_of_local_variable.patch | 23 -
9 files changed, 1446 insertions(+), 1365 deletions(-)
create mode 100644 recipes-core/openjdk/openjdk-8-native_102b14.bb
delete mode 100644 recipes-core/openjdk/openjdk-8-native_72b05.bb
rename recipes-core/openjdk/{openjdk-8-release-72b05.inc => openjdk-8-release-102b14.inc} (62%)
rename recipes-core/openjdk/{openjdk-8_72b05.bb => openjdk-8_102b14.bb} (95%)
rename recipes-core/openjdk/{openjre-8_72b05.bb => openjre-8_102b14.bb} (92%)
delete mode 100644 recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch
create mode 100644 recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch
delete mode 100644 recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patchrecipes-core/openjdk/openjdk-8-native_102b14.bb new file +2 -0
@@ -0,0 +1,2 @@ +require openjdk-8-release-102b14.inc +require openjdk-8-native.inc
recipes-core/openjdk/openjdk-8-native_72b05.bb deleted +0 -2
@@ -1,2 +0,0 @@ -require openjdk-8-release-72b05.inc -require openjdk-8-native.inc
recipes-core/openjdk/openjdk-8-release-102b14.inc renamed from recipes-core/openjdk/openjdk-8-release-72b05.inc +25 -26
72 lines not on this page · raw message
recipes-core/openjdk/openjdk-8_102b14.bb renamed from recipes-core/openjdk/openjdk-8_72b05.bb +2 -2
@@ -1,4 +1,4 @@ -require openjdk-8-release-72b05.inc +require openjdk-8-release-102b14.inc require openjdk-8-cross.inc # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch
@@ -8,10 +8,10 @@ PATCHES_URI_append = "\ file://openjdk8-restrict-to-staging-dir.patch;apply=no \ file://openjdk8-fix-shark-build.patch;apply=no \ file://openjdk8-fix-shark-stdc++11.patch;apply=no \ - file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \ file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ file://openjdk8-fix-adlc-flags.patch;apply=no \ file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ + file://openjdk8-fix-zero-mode-crash.patch;apply=no \ " do_install() {
recipes-core/openjdk/openjre-8_102b14.bb renamed from recipes-core/openjdk/openjre-8_72b05.bb +2 -2
@@ -1,4 +1,4 @@ -require openjdk-8-release-72b05.inc +require openjdk-8-release-102b14.inc require openjdk-8-cross.inc # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch
@@ -8,10 +8,10 @@ PATCHES_URI_append = "\ file://openjdk8-restrict-to-staging-dir.patch;apply=no \ file://openjdk8-fix-shark-build.patch;apply=no \ file://openjdk8-fix-shark-stdc++11.patch;apply=no \ - file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \ file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ file://openjdk8-fix-adlc-flags.patch;apply=no \ file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ + file://openjdk8-fix-zero-mode-crash.patch;apply=no \ " do_install() {
recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch deleted +0 -53
53 lines not on this page · raw message
recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch +1366 -1257
2,839 lines not on this page · raw message
recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch new file +49 -0
49 lines not on this page · raw message
recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch deleted +0 -23
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 12 lines
2.7.4 --------------------------------------------------------------------- Intel Finland Oy Registered Address: PL 281, 00181 Helsinki Business Identity Code: 0357606 - 4 Domiciled in Helsinki This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Part of the diff is not shown here. View the raw message.
PATCH v2 2/2 openjdk-8-release-102b14.inc: Ignore deprecation
readdir_r has been deprecated since glibc 2.24. As openjdk uses this function, a warning is generated during build that gets turned into an error when -Werror is used.
While the readdir function is suggested as an replacement, it has slightly different API. The warning is ignored instead to prevent any unexpected breakage from patching the offending functions.
--- recipes-core/openjdk/openjdk-8-release-102b14.inc | 4 ++++ 1 file changed, 4 insertions(+)
recipes-core/openjdk/openjdk-8-release-102b14.inc +4 -0
@@ -15,6 +15,10 @@ BUILD_DIR_ECJ = "openjdk.build-ecj" # Force arm mode for now ARM_INSTRUCTION_SET_armv4t = "ARM" +# readdir_r was deprecated in glibc-2.24. Ignore the error for now +# NOTE: When updating the recipe, please check if this is still needed +CFLAGS_append = " -Wno-error=deprecated-declarations" + # Enable zero mode for arm based builds, as normal hotspot fails to build PACKAGECONFIG_append_arm = " zero"
Signature · 12 lines
2.7.4 --------------------------------------------------------------------- Intel Finland Oy Registered Address: PL 281, 00181 Helsinki Business Identity Code: 0357606 - 4 Domiciled in Helsinki This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Re: [meta-java][PATCH v2 2/2] openjdk-8-release-102b14.inc: Ignore deprecation
Hi Erkka,
Quoted 3 lines · Erkka Kääriä
readdir_rhas been deprecated since glibc 2.24. As openjdk uses this function, a warning is generated during build that gets turned into an error when -Werror is used.
Yes, this fixes the build error that we got with the first version. Thank you!
However,we are getting another QA Error with the build:
ERROR: openjre-8-102b14-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: '/media/poky/build/tmp/work/core2-64-poky-linux/openjre-8/102b14-r0/packages-split/openjre-8/usr/lib/jvm/openjre-8/lib/amd64/libjsig.so' No GNU_HASH in the elf binary: '/media/poky/build/tmp/work/core2-64-poky-linux/openjre-8/102b14-r0/packages-split/openjre-8/usr/lib/jvm/openjre-8/lib/amd64/server/libjvm.so' [ldflags]
ERROR: openjre-8-102b14-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.
ERROR: openjre-8-102b14-r0 do_package_qa: Function failed: do_package_qa
ERROR: Logfile of failure stored in: /media/poky/build/tmp/work/core2-64-poky-linux/openjre-8/102b14-r0/temp/log.do_package_qa.22839
ERROR: Task /home/maxin/clone/meta-java/recipes-core/openjdk/openjre-8_102b14.bb:do_package_qa (/home/maxin/clone/meta-java/recipes-core/openjdk/openjre-8_102b14.bb:do_package_qa) failed with exit code '1'
NOTE: Tasks Summary: Attempted 1344 tasks of which 1332 didn't need to be rerun and 1 failed.
NOTE: Writing buildhistory
<snip>
Could you please look into this ?
Best Regards,
Maxin
Re: [meta-java][PATCH v2 2/2] openjdk-8-release-102b14.inc: Ignore deprecation
Hi Maxin,
This failure is unrelated to the patch, caused by changes in the oe-core:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=a98a8180863ff45b477a1f8439ebcec21151d282
As far as I can tell, the current openjdk version is equally affected. I'll look into fixing the error though.
Best Regards,
Erkka Kääriä
Quoted 44 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Maxin B. John
Sent: Thursday, August 18, 2016 3:27 PM
To: [email protected]
Subject: Re: [oe] [meta-java][PATCH v2 2/2] openjdk-8-release-102b14.inc:
Ignore deprecationHi Erkka,
Quoted 3 lines · Erkka Kääriä
readdir_rhas been deprecated since glibc 2.24. As openjdk uses this function, a warning is generated during build that gets turned into an error when -Werror is used.Yes, this fixes the build error that we got with the first version. Thank you!
However,we are getting another QA Error with the build:
ERROR: openjre-8-102b14-r0
do_package_qa: QA Issue: NoGNU_HASHin the elf binary: '/media/poky/build/tmp/work/core2-64-poky-linux/openjre- 8/102b14-r0/packages-split/openjre-8/usr/lib/jvm/openjre- 8/lib/amd64/libjsig.so'
NoGNU_HASHin the elf binary: '/media/poky/build/tmp/work/core2-64- poky-linux/openjre-8/102b14-r0/packages-split/openjre- 8/usr/lib/jvm/openjre-8/lib/amd64/server/libjvm.so' [ldflags]
ERROR: openjre-8-102b14-r0do_package_qa: QA run found fatal errors. Please consider fixing them.
ERROR: openjre-8-102b14-r0do_package_qa: Function failed:do_package_qa
ERROR: Logfile of failure stored in: /media/poky/build/tmp/work/core2-64- poky-linux/openjre-8/102b14-r0/temp/log.do_package_qa.22839
ERROR: Task/home/maxin/clone/meta-java/recipes-core/openjdk/openjre-8_102b14.bb:do_package_qa (/home/maxin/clone/meta-java/recipes-core/openjdk/openjre-8_102b14.bb:do_package_qa) failed with exit code '1'
NOTE: Tasks Summary: Attempted 1344 tasks of which 1332 didn't need to be rerun and 1 failed.
NOTE: Writing buildhistory<snip>
Could you please look into this ?
Quoted 7 lines
Best Regards,
Maxin
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.