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/2005-jdk-use-correct-include-for-signal.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/2005-jdk-use-correct-include-for-signal.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch index f1f5102..b38dcb3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 385b2007a60c3e792062107d3c4f653fe63d4c63 Mon Sep 17 00:00:00 2001 | 1 | From ddcec385593175ee01b9f000457a34b3d7ab5ab4 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 2005/2009] jdk: use correct include for signal | 4 | Subject: [PATCH] jdk: use correct include for signal |
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 |
@@ -26,15 +26,16 @@ the following command: | |||
26 | Upstream-Status: Pending | 26 | Upstream-Status: Pending |
27 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 27 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
28 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 28 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
29 | |||
29 | --- | 30 | --- |
30 | src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- | 31 | jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- |
31 | src/macosx/javavm/export/jvm_md.h | 2 +- | 32 | jdk/src/macosx/javavm/export/jvm_md.h | 2 +- |
32 | src/solaris/javavm/export/jvm_md.h | 2 +- | 33 | jdk/src/solaris/javavm/export/jvm_md.h | 2 +- |
33 | src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- | 34 | jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- |
34 | 4 files changed, 4 insertions(+), 4 deletions(-) | 35 | 4 files changed, 4 insertions(+), 4 deletions(-) |
35 | 36 | ||
36 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 37 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c |
37 | index c0d5857962..c4abb7ae5d 100644 | 38 | index c0d58579..c4abb7ae 100644 |
38 | --- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 39 | --- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c |
39 | +++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 40 | +++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c |
40 | @@ -32,7 +32,7 @@ | 41 | @@ -32,7 +32,7 @@ |
@@ -47,7 +48,7 @@ index c0d5857962..c4abb7ae5d 100644 | |||
47 | /* Also defined in src/aix/native/java/net/aix_close.c */ | 48 | /* Also defined in src/aix/native/java/net/aix_close.c */ |
48 | #define INTERRUPT_SIGNAL (SIGRTMAX - 1) | 49 | #define INTERRUPT_SIGNAL (SIGRTMAX - 1) |
49 | diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h | 50 | diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h |
50 | index 012bb1babe..0b57576833 100644 | 51 | index 012bb1ba..0b575768 100644 |
51 | --- a/jdk/src/macosx/javavm/export/jvm_md.h | 52 | --- a/jdk/src/macosx/javavm/export/jvm_md.h |
52 | +++ b/jdk/src/macosx/javavm/export/jvm_md.h | 53 | +++ b/jdk/src/macosx/javavm/export/jvm_md.h |
53 | @@ -60,7 +60,7 @@ | 54 | @@ -60,7 +60,7 @@ |
@@ -60,7 +61,7 @@ index 012bb1babe..0b57576833 100644 | |||
60 | /* O Flags */ | 61 | /* O Flags */ |
61 | 62 | ||
62 | diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h | 63 | diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h |
63 | index 5c681914bb..62415ee255 100644 | 64 | index 5c681914..62415ee2 100644 |
64 | --- a/jdk/src/solaris/javavm/export/jvm_md.h | 65 | --- a/jdk/src/solaris/javavm/export/jvm_md.h |
65 | +++ b/jdk/src/solaris/javavm/export/jvm_md.h | 66 | +++ b/jdk/src/solaris/javavm/export/jvm_md.h |
66 | @@ -65,7 +65,7 @@ | 67 | @@ -65,7 +65,7 @@ |
@@ -73,7 +74,7 @@ index 5c681914bb..62415ee255 100644 | |||
73 | /* O Flags */ | 74 | /* O Flags */ |
74 | 75 | ||
75 | diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 76 | diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c |
76 | index 5e2a78b7af..204f0441a9 100644 | 77 | index 5e2a78b7..204f0441 100644 |
77 | --- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 78 | --- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c |
78 | +++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 79 | +++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c |
79 | @@ -34,7 +34,7 @@ | 80 | @@ -34,7 +34,7 @@ |
@@ -85,6 +86,3 @@ index 5e2a78b7af..204f0441a9 100644 | |||
85 | /* Also defined in net/linux_close.c */ | 86 | /* Also defined in net/linux_close.c */ |
86 | #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) | 87 | #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) |
87 | #elif __solaris__ | 88 | #elif __solaris__ |
88 | -- | ||
89 | 2.26.2 | ||
90 | |||