diff options
author | Geoff Parker <geoffrey.parker@arthrex.com> | 2023-05-01 19:26:20 -0700 |
---|---|---|
committer | Richard <g0hl1n@users.noreply.github.com> | 2023-05-02 09:02:27 +0200 |
commit | bf6ae1dac46dc9894f206c7f81570548dbf6785c (patch) | |
tree | 6cffa5a73f21963c52034d5dc5f66f8d935e3d96 /recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch | |
parent | e122acf3e9570ceb055e55feb41e5558463253e4 (diff) | |
download | meta-java-bf6ae1dac46dc9894f206c7f81570548dbf6785c.tar.gz |
openjdk-8: Update patches for patch fuzz for Yocto 4.2 mickledore
Yocto 4.2 bitbake is more pedantic on patch fuzz, which treats
patch fuzz Warnings as Errors, and fails the bulid.
Corrected patch fuzz with:
devtool modify openjdk-8-native
devtool finish --force-patch-refresh openjdk-8-native <meta-java layer_path>
but removed the changes to 1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
which rewrote a huge amount of source files in their entirety for some reason.
Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch index aa93c25..7739c8b 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e40d948b71ff33d74c6e1595a798f359fb673d8f Mon Sep 17 00:00:00 2001 | 1 | From 9f2a5acce1da9908a7e94388880c831e1635e51f Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 | 3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 |
4 | Subject: [PATCH 1002/1013] hotspot: use correct include for poll | 4 | Subject: [PATCH] hotspot: use correct include for poll |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -23,15 +23,16 @@ Upstream-Status: Pending | |||
23 | 23 | ||
24 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 24 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
25 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 25 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
26 | |||
26 | --- | 27 | --- |
27 | src/os/aix/vm/os_aix.inline.hpp | 2 +- | 28 | hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +- |
28 | src/os/bsd/vm/os_bsd.inline.hpp | 2 +- | 29 | hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +- |
29 | src/os/linux/vm/os_linux.inline.hpp | 2 +- | 30 | hotspot/src/os/linux/vm/os_linux.inline.hpp | 2 +- |
30 | src/os/solaris/vm/os_solaris.inline.hpp | 2 +- | 31 | hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 2 +- |
31 | 4 files changed, 4 insertions(+), 4 deletions(-) | 32 | 4 files changed, 4 insertions(+), 4 deletions(-) |
32 | 33 | ||
33 | diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp | 34 | diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp |
34 | index 421ea342e..9a1e1e096 100644 | 35 | index 421ea342..9a1e1e09 100644 |
35 | --- a/hotspot/src/os/aix/vm/os_aix.inline.hpp | 36 | --- a/hotspot/src/os/aix/vm/os_aix.inline.hpp |
36 | +++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp | 37 | +++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp |
37 | @@ -34,7 +34,7 @@ | 38 | @@ -34,7 +34,7 @@ |
@@ -44,7 +45,7 @@ index 421ea342e..9a1e1e096 100644 | |||
44 | #include <netdb.h> | 45 | #include <netdb.h> |
45 | 46 | ||
46 | diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 47 | diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp |
47 | index c35abf486..8ff584aee 100644 | 48 | index c35abf48..8ff584ae 100644 |
48 | --- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 49 | --- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp |
49 | +++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 50 | +++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp |
50 | @@ -33,7 +33,7 @@ | 51 | @@ -33,7 +33,7 @@ |
@@ -57,7 +58,7 @@ index c35abf486..8ff584aee 100644 | |||
57 | 58 | ||
58 | inline void* os::thread_local_storage_at(int index) { | 59 | inline void* os::thread_local_storage_at(int index) { |
59 | diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp | 60 | diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp |
60 | index a23bd5631..9d56de0ef 100644 | 61 | index a23bd563..9d56de0e 100644 |
61 | --- a/hotspot/src/os/linux/vm/os_linux.inline.hpp | 62 | --- a/hotspot/src/os/linux/vm/os_linux.inline.hpp |
62 | +++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp | 63 | +++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp |
63 | @@ -33,7 +33,7 @@ | 64 | @@ -33,7 +33,7 @@ |
@@ -70,7 +71,7 @@ index a23bd5631..9d56de0ef 100644 | |||
70 | 71 | ||
71 | inline void* os::thread_local_storage_at(int index) { | 72 | inline void* os::thread_local_storage_at(int index) { |
72 | diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 73 | diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp |
73 | index 8e095ab69..ce37e9a12 100644 | 74 | index 8e095ab6..ce37e9a1 100644 |
74 | --- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 75 | --- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp |
75 | +++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 76 | +++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp |
76 | @@ -33,7 +33,7 @@ | 77 | @@ -33,7 +33,7 @@ |
@@ -82,6 +83,3 @@ index 8e095ab69..ce37e9a12 100644 | |||
82 | #include <sys/filio.h> | 83 | #include <sys/filio.h> |
83 | #include <unistd.h> | 84 | #include <unistd.h> |
84 | #include <netdb.h> | 85 | #include <netdb.h> |
85 | -- | ||
86 | 2.26.2 | ||
87 | |||