diff options
author | André Draszik <andre.draszik@jci.com> | 2018-08-20 16:32:31 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2018-08-21 08:14:04 +0200 |
commit | 9d85ff7259d0352c5ed84dc56f8a29119fdedafe (patch) | |
tree | 5d03f4fe8bb1253d7574339a7f5e2891045818c3 | |
parent | c20f86c7737f336bebb1800091712765f038d77e (diff) | |
download | meta-java-9d85ff7259d0352c5ed84dc56f8a29119fdedafe.tar.gz |
openjdk-8: fix malformed patches
git am complains:
Warning: commit message did not conform to UTF-8.
You may want to amend it after fixing the message, or set the config
variable i18n.commitencoding to the encoding your project uses.
Not sure what happened there when they were applied to git, they
certainly weren't sent like that to the mailing list.
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Leitner <dev@g0hl1n.net>
16 files changed, 32 insertions, 32 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch b/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch index dcadea1..a94e90f 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From bdea8cf299313388ec41ea20281deca6dc4f764d Mon Sep 17 00:00:00 2001 | 1 | From bdea8cf299313388ec41ea20281deca6dc4f764d Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 14:41:06 +0000 | 3 | Date: Tue, 27 Feb 2018 14:41:06 +0000 |
4 | Subject: [PATCH 2/9] hotspot: fix compilation with security flags enabled | 4 | Subject: [PATCH 2/9] hotspot: fix compilation with security flags enabled |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -18,7 +18,7 @@ Content-Transfer-Encoding: 8bit | |||
18 | Backport a patch to fix this. | 18 | Backport a patch to fix this. |
19 | 19 | ||
20 | Upstream-Status: Backport [http://hg.openjdk.java.net/jdk10/jdk10/hotspot/rev/eb11b3f0ae65] | 20 | Upstream-Status: Backport [http://hg.openjdk.java.net/jdk10/jdk10/hotspot/rev/eb11b3f0ae65] |
21 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 21 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
22 | --- | 22 | --- |
23 | hotspot/src/share/vm/code/dependencies.cpp | 2 +- | 23 | hotspot/src/share/vm/code/dependencies.cpp | 2 +- |
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
diff --git a/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch index 8b3420e..45573e4 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 79e35bd203b40979e1d241a04d6d9df373327bef Mon Sep 17 00:00:00 2001 | 1 | From 79e35bd203b40979e1d241a04d6d9df373327bef Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 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 5/9] hotspot: use correct include for poll | 4 | Subject: [PATCH 5/9] hotspot: use correct include for poll |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -20,7 +20,7 @@ the following command: | |||
20 | done | 20 | done |
21 | 21 | ||
22 | Upstream-Status: Pending | 22 | Upstream-Status: Pending |
23 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 23 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
24 | --- | 24 | --- |
25 | hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +- | 25 | hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +- |
26 | hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +- | 26 | hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +- |
diff --git a/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch b/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch index 81dbebd..f6af83e 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 4ed4b58270dcd3d897adef605893c104944c4f3a Mon Sep 17 00:00:00 2001 | 1 | From 4ed4b58270dcd3d897adef605893c104944c4f3a Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 15:00:55 +0000 | 3 | Date: Tue, 27 Feb 2018 15:00:55 +0000 |
4 | Subject: [PATCH 6/9] hotspot: don't rely on old SysV SIGCLD | 4 | Subject: [PATCH 6/9] hotspot: don't rely on old SysV SIGCLD |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -17,7 +17,7 @@ leads to the following compilation error: | |||
17 | Just make it conditional, so the code compiles everywhere. | 17 | Just make it conditional, so the code compiles everywhere. |
18 | 18 | ||
19 | Upstream-Status: Pending | 19 | Upstream-Status: Pending |
20 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 20 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
21 | --- | 21 | --- |
22 | hotspot/src/os/linux/vm/jvm_linux.cpp | 2 ++ | 22 | hotspot/src/os/linux/vm/jvm_linux.cpp | 2 ++ |
23 | 1 file changed, 2 insertions(+) | 23 | 1 file changed, 2 insertions(+) |
diff --git a/recipes-core/openjdk/patches-openjdk-8/0007-jdk-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/0007-jdk-use-correct-include-for-poll.patch index af4dde9..2efdbf5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0007-jdk-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0007-jdk-use-correct-include-for-poll.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From df9c5738c4a8a00ba65948503ff0c0cfa2f17e95 Mon Sep 17 00:00:00 2001 | 1 | From df9c5738c4a8a00ba65948503ff0c0cfa2f17e95 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 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 7/9] jdk: use correct include for poll | 4 | Subject: [PATCH 7/9] jdk: use correct include for poll |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -23,7 +23,7 @@ the following command: | |||
23 | done | 23 | done |
24 | 24 | ||
25 | Upstream-Status: Pending | 25 | Upstream-Status: Pending |
26 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 26 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
27 | --- | 27 | --- |
28 | jdk/src/aix/native/java/net/aix_close.c | 2 +- | 28 | jdk/src/aix/native/java/net/aix_close.c | 2 +- |
29 | jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- | 29 | jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- |
diff --git a/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch b/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch index 406de52..05f9558 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From a063ee68bc0dd7dbf9737df4ee191e98796f2f6a Mon Sep 17 00:00:00 2001 | 1 | From a063ee68bc0dd7dbf9737df4ee191e98796f2f6a Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 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 8/9] jdk: use correct include for signal | 4 | Subject: [PATCH 8/9] jdk: use correct include for signal |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -24,7 +24,7 @@ the following command: | |||
24 | done | 24 | done |
25 | 25 | ||
26 | Upstream-Status: Pending | 26 | Upstream-Status: Pending |
27 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 27 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
28 | --- | 28 | --- |
29 | jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- | 29 | jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- |
30 | jdk/src/macosx/javavm/export/jvm_md.h | 2 +- | 30 | jdk/src/macosx/javavm/export/jvm_md.h | 2 +- |
diff --git a/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch b/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch index 68f3d7a..43130b5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 8ef989f82b29655e8d4532f14d5aa12a2999d850 Mon Sep 17 00:00:00 2001 | 1 | From 8ef989f82b29655e8d4532f14d5aa12a2999d850 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 13:58:07 +0000 | 3 | Date: Fri, 2 Mar 2018 13:58:07 +0000 |
4 | Subject: [PATCH 10/10] jdk: disable backtrace() (musl build fix) | 4 | Subject: [PATCH 10/10] jdk: disable backtrace() (musl build fix) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -13,7 +13,7 @@ Use appropriate #ifdef to disable their use on musl and thus | |||
13 | to fix the build on musl. | 13 | to fix the build on musl. |
14 | 14 | ||
15 | Upstream-Status: Pending | 15 | Upstream-Status: Pending |
16 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 16 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
17 | --- | 17 | --- |
18 | jdk/src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- | 18 | jdk/src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- |
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
diff --git a/recipes-core/openjdk/patches-openjdk-8/0010-build-fix-build-on-as-needed-toolchains-generic.patch b/recipes-core/openjdk/patches-openjdk-8/0010-build-fix-build-on-as-needed-toolchains-generic.patch index 7decd5e..2d02b7c 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0010-build-fix-build-on-as-needed-toolchains-generic.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0010-build-fix-build-on-as-needed-toolchains-generic.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 84bcdb9cdab0e0be9cdfededfb518d3cea9009e3 Mon Sep 17 00:00:00 2001 | 1 | From 84bcdb9cdab0e0be9cdfededfb518d3cea9009e3 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 12 Mar 2018 15:40:58 +0000 | 3 | Date: Mon, 12 Mar 2018 15:40:58 +0000 |
4 | Subject: [PATCH] build: fix build on --as-needed toolchains (generic) | 4 | Subject: [PATCH] build: fix build on --as-needed toolchains (generic) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -64,7 +64,7 @@ place the $EXPECTED_OBJS early in the command line, before | |||
64 | any additional libraries, so as to fix this once and for | 64 | any additional libraries, so as to fix this once and for |
65 | all. | 65 | all. |
66 | 66 | ||
67 | Signed-off-by: André Draszik <andre.draszik at jci.com> | 67 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
68 | --- | 68 | --- |
69 | Upstream-Status: Pending | 69 | Upstream-Status: Pending |
70 | make/common/NativeCompilation.gmk | 5 ++--- | 70 | make/common/NativeCompilation.gmk | 5 ++--- |
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0001-hotspot-stop-using-obsolete-isnanf.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0001-hotspot-stop-using-obsolete-isnanf.patch index e165170..ebe6547 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0001-hotspot-stop-using-obsolete-isnanf.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0001-hotspot-stop-using-obsolete-isnanf.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 1624e2dd3739fe208efa13b31abf4bc53ae2e5c1 Mon Sep 17 00:00:00 2001 | 1 | From 1624e2dd3739fe208efa13b31abf4bc53ae2e5c1 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 11:24:44 +0000 | 3 | Date: Tue, 27 Feb 2018 11:24:44 +0000 |
4 | Subject: [PATCH 1/9] hotspot: stop using obsolete isnanf() | 4 | Subject: [PATCH 1/9] hotspot: stop using obsolete isnanf() |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -19,7 +19,7 @@ replacing isnanf(), even on glibc. | |||
19 | Do so. | 19 | Do so. |
20 | 20 | ||
21 | Upstream-Status: Pending | 21 | Upstream-Status: Pending |
22 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 22 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
23 | --- | 23 | --- |
24 | hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp | 2 +- | 24 | hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp | 2 +- |
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch index 1874f87..06cdcaf 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 2ba0f3fae90f2d2c310663e4b39e90f969116241 Mon Sep 17 00:00:00 2001 | 1 | From 2ba0f3fae90f2d2c310663e4b39e90f969116241 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 15:59:09 +0000 | 3 | Date: Tue, 27 Feb 2018 15:59:09 +0000 |
4 | Subject: [PATCH 2/9] jdk: give a much bigger buffer to getmntent_r() | 4 | Subject: [PATCH 2/9] jdk: give a much bigger buffer to getmntent_r() |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit | |||
9 | https://bugs.alpinelinux.org/issues/7093 | 9 | https://bugs.alpinelinux.org/issues/7093 |
10 | 10 | ||
11 | Upstream-Status: Inappropriate [musl specific] | 11 | Upstream-Status: Inappropriate [musl specific] |
12 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 12 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
13 | --- | 13 | --- |
14 | .../native/sun/nio/fs/LinuxNativeDispatcher.c | 29 +++++++++++++++------- | 14 | .../native/sun/nio/fs/LinuxNativeDispatcher.c | 29 +++++++++++++++------- |
15 | 1 file changed, 20 insertions(+), 9 deletions(-) | 15 | 1 file changed, 20 insertions(+), 9 deletions(-) |
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch index 8ad000d..6990d55 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 4429d73853b3938a53a6058cc0dcaac08d191995 Mon Sep 17 00:00:00 2001 | 1 | From 4429d73853b3938a53a6058cc0dcaac08d191995 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 16:01:54 +0000 | 3 | Date: Tue, 27 Feb 2018 16:01:54 +0000 |
4 | Subject: [PATCH 3/9] jdk: fix libjvm load on musl (set LD_LIBRARY_PATH) | 4 | Subject: [PATCH 3/9] jdk: fix libjvm load on musl (set LD_LIBRARY_PATH) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -14,7 +14,7 @@ Patch taken from Alpine Linux: | |||
14 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-fix-libjvm-load.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 | 14 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-fix-libjvm-load.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 |
15 | 15 | ||
16 | Upstream-Status: Inappropriate [musl specific] | 16 | Upstream-Status: Inappropriate [musl specific] |
17 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 17 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
18 | --- | 18 | --- |
19 | jdk/src/solaris/bin/java_md_solinux.c | 2 ++ | 19 | jdk/src/solaris/bin/java_md_solinux.c | 2 ++ |
20 | 1 file changed, 2 insertions(+) | 20 | 1 file changed, 2 insertions(+) |
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch index 086f669..0c20627 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 86945e6df4dc15d5c2402a656d1d9d1b25945fb2 Mon Sep 17 00:00:00 2001 | 1 | From 86945e6df4dc15d5c2402a656d1d9d1b25945fb2 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 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 4/9] jdk: remove sysctl.h include (musl build fix) | 4 | Subject: [PATCH 4/9] jdk: remove sysctl.h include (musl build fix) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -16,7 +16,7 @@ etc. | |||
16 | Remove it, at things seem to work without as well. | 16 | Remove it, at things seem to work without as well. |
17 | 17 | ||
18 | Upstream-Status: Inappropriate [musl specific] | 18 | Upstream-Status: Inappropriate [musl specific] |
19 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 19 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
20 | --- | 20 | --- |
21 | jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c | 1 - | 21 | jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c | 1 - |
22 | jdk/src/solaris/native/java/net/PlainSocketImpl.c | 1 - | 22 | jdk/src/solaris/native/java/net/PlainSocketImpl.c | 1 - |
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch index 913b318..24342b5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 19b1d6b4dc64a1c44a8f90776a489eee5c76463d Mon Sep 17 00:00:00 2001 | 1 | From 19b1d6b4dc64a1c44a8f90776a489eee5c76463d Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 15:12:08 +0000 | 3 | Date: Tue, 27 Feb 2018 15:12:08 +0000 |
4 | Subject: [PATCH 5/9] hotspot: disable agent build | 4 | Subject: [PATCH 5/9] hotspot: disable agent build |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit | |||
9 | the agent needs thread_db, which doesn't exist in musl | 9 | the agent needs thread_db, which doesn't exist in musl |
10 | 10 | ||
11 | Upstream-Status: Inappropriate [musl specific] | 11 | Upstream-Status: Inappropriate [musl specific] |
12 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 12 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
13 | --- | 13 | --- |
14 | common/autoconf/jdk-options.m4 | 2 +- | 14 | common/autoconf/jdk-options.m4 | 2 +- |
15 | hotspot/make/linux/makefiles/defs.make | 4 ++++ | 15 | hotspot/make/linux/makefiles/defs.make | 4 ++++ |
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch index f0696fc..4abd558 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From a02a9fbc3f1fed181504bdb5b0a16863247f92fc Mon Sep 17 00:00:00 2001 | 1 | From a02a9fbc3f1fed181504bdb5b0a16863247f92fc Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 10:11:51 +0000 | 3 | Date: Fri, 2 Mar 2018 10:11:51 +0000 |
4 | Subject: [PATCH 6/9] hotspot: os_linux: remove glibc dependencies | 4 | Subject: [PATCH 6/9] hotspot: os_linux: remove glibc dependencies |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -21,7 +21,7 @@ Content-Transfer-Encoding: 8bit | |||
21 | | dlsym | 21 | | dlsym |
22 | 22 | ||
23 | Upstream-Status: Inappropriate [musl specific] | 23 | Upstream-Status: Inappropriate [musl specific] |
24 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 24 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
25 | --- | 25 | --- |
26 | hotspot/src/os/linux/vm/os_linux.cpp | 12 +++++++++++- | 26 | hotspot/src/os/linux/vm/os_linux.cpp | 12 +++++++++++- |
27 | 1 file changed, 11 insertions(+), 1 deletion(-) | 27 | 1 file changed, 11 insertions(+), 1 deletion(-) |
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch index 7dcb889..3328d25 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From dc0217d20e3c96203c81acda1c02652755bfcefb Mon Sep 17 00:00:00 2001 | 1 | From dc0217d20e3c96203c81acda1c02652755bfcefb Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 10:24:11 +0000 | 3 | Date: Fri, 2 Mar 2018 10:24:11 +0000 |
4 | Subject: [PATCH 7/9] hotspot: os_linux_x86: remove glibc dependencies | 4 | Subject: [PATCH 7/9] hotspot: os_linux_x86: remove glibc dependencies |
5 | (fpu_control.h) | 5 | (fpu_control.h) |
@@ -14,7 +14,7 @@ Patch adopted from Alpine linux: | |||
14 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-hotspot-musl.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 | 14 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-hotspot-musl.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 |
15 | 15 | ||
16 | Upstream-Status: Inappropriate [musl specific] | 16 | Upstream-Status: Inappropriate [musl specific] |
17 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 17 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
18 | --- | 18 | --- |
19 | hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 4 +++- | 19 | hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 4 +++- |
20 | 1 file changed, 3 insertions(+), 1 deletion(-) | 20 | 1 file changed, 3 insertions(+), 1 deletion(-) |
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch index c15895f..1e4e500 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From ec37e9e5663611e49c7c976d34450ea6b90d0f24 Mon Sep 17 00:00:00 2001 | 1 | From ec37e9e5663611e49c7c976d34450ea6b90d0f24 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 13:37:20 +0000 | 3 | Date: Fri, 2 Mar 2018 13:37:20 +0000 |
4 | Subject: [PATCH 8/9] jdk: musl build fix (use SIGRTMAX rather than __SIGRTMAX) | 4 | Subject: [PATCH 8/9] jdk: musl build fix (use SIGRTMAX rather than __SIGRTMAX) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -24,7 +24,7 @@ Patch taken from Alpine Linux: | |||
24 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-musl.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 | 24 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-musl.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 |
25 | 25 | ||
26 | Upstream-Status: Inappropriate [musl specific] | 26 | Upstream-Status: Inappropriate [musl specific] |
27 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 27 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
28 | --- | 28 | --- |
29 | jdk/src/solaris/native/java/net/linux_close.c | 3 ++- | 29 | jdk/src/solaris/native/java/net/linux_close.c | 3 ++- |
30 | jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- | 30 | jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- |
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0009-jdk-musl-has-gethostby_r.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0009-jdk-musl-has-gethostby_r.patch index c033b77..3f3387b 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0009-jdk-musl-has-gethostby_r.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0009-jdk-musl-has-gethostby_r.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | From 276fb5b2d57cf0257dc82e84d80213fe3eec6e34 Mon Sep 17 00:00:00 2001 | 1 | From 276fb5b2d57cf0257dc82e84d80213fe3eec6e34 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 13:57:22 +0000 | 3 | Date: Fri, 2 Mar 2018 13:57:22 +0000 |
4 | Subject: [PATCH 9/9] jdk: musl has gethostby_r() | 4 | Subject: [PATCH 9/9] jdk: musl has gethostby_r() |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
@@ -12,7 +12,7 @@ Patch taken from Alpine Linux: | |||
12 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-musl.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 | 12 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-musl.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 |
13 | 13 | ||
14 | Upstream-Status: Inappropriate [musl specific] | 14 | Upstream-Status: Inappropriate [musl specific] |
15 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | 15 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
16 | --- | 16 | --- |
17 | jdk/src/solaris/native/java/net/Inet4AddressImpl.c | 2 +- | 17 | jdk/src/solaris/native/java/net/Inet4AddressImpl.c | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |