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/0001-Allow-using-a-system-installed-libjpeg.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/0001-Allow-using-a-system-installed-libjpeg.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch index 3bc5630..00ce23f 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 21c555306afcc4cab2819adc550f1546f3390d15 Mon Sep 17 00:00:00 2001 | 1 | From 74366a35d754d2dacab28d36804b5cde5dec481b 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 13:36:53 +0000 | 3 | Date: Tue, 27 Feb 2018 13:36:53 +0000 |
4 | Subject: [PATCH 01/13] Allow using a system-installed libjpeg | 4 | Subject: [PATCH] Allow using a system-installed libjpeg |
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 |
@@ -22,12 +22,13 @@ Upstream-Status: Backport | |||
22 | 22 | ||
23 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 23 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
24 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 24 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
25 | |||
25 | --- | 26 | --- |
26 | common/autoconf/libraries.m4 | 35 ++++++++++++++++++++++++++++++----- | 27 | common/autoconf/libraries.m4 | 35 ++++++++++++++++++++++++++++++----- |
27 | 1 file changed, 30 insertions(+), 5 deletions(-) | 28 | 1 file changed, 30 insertions(+), 5 deletions(-) |
28 | 29 | ||
29 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | 30 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 |
30 | index 6d803f9..d2732eb 100644 | 31 | index 6d803f9b..d2732eb8 100644 |
31 | --- a/common/autoconf/libraries.m4 | 32 | --- a/common/autoconf/libraries.m4 |
32 | +++ b/common/autoconf/libraries.m4 | 33 | +++ b/common/autoconf/libraries.m4 |
33 | @@ -774,11 +774,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], | 34 | @@ -774,11 +774,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], |
@@ -72,6 +73,3 @@ index 6d803f9..d2732eb 100644 | |||
72 | AC_SUBST(USE_EXTERNAL_LIBJPEG) | 73 | AC_SUBST(USE_EXTERNAL_LIBJPEG) |
73 | 74 | ||
74 | ############################################################################### | 75 | ############################################################################### |
75 | -- | ||
76 | 2.26.2 | ||
77 | |||