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/0002-Allow-using-a-system-installed-libpng.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/0002-Allow-using-a-system-installed-libpng.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch index 98c09d6..64f4bce 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 17413a1bca9a6c27e049122d65b0d4fa291a53ec Mon Sep 17 00:00:00 2001 | 1 | From 048b9cb7910cf2f04f73483dd9755aeb50017e6b 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: Thu, 2 Jan 2020 13:40:50 +0100 | 3 | Date: Thu, 2 Jan 2020 13:40:50 +0100 |
4 | Subject: [PATCH 02/13] Allow using a system-installed libpng | 4 | Subject: [PATCH] Allow using a system-installed libpng |
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 |
@@ -19,12 +19,13 @@ Upstream-Status: Backport | |||
19 | 19 | ||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 20 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
22 | |||
22 | --- | 23 | --- |
23 | common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++++++++++++++++ | 24 | common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++++++++++++++++ |
24 | 1 file changed, 41 insertions(+) | 25 | 1 file changed, 41 insertions(+) |
25 | 26 | ||
26 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | 27 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 |
27 | index d2732eb..727f018 100644 | 28 | index d2732eb8..727f0181 100644 |
28 | --- a/common/autoconf/libraries.m4 | 29 | --- a/common/autoconf/libraries.m4 |
29 | +++ b/common/autoconf/libraries.m4 | 30 | +++ b/common/autoconf/libraries.m4 |
30 | @@ -843,6 +843,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], | 31 | @@ -843,6 +843,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], |
@@ -75,6 +76,3 @@ index d2732eb..727f018 100644 | |||
75 | ############################################################################### | 76 | ############################################################################### |
76 | # | 77 | # |
77 | # Check for the zlib library | 78 | # Check for the zlib library |
78 | -- | ||
79 | 2.26.2 | ||
80 | |||