diff options
author | André Draszik <andre.draszik@jci.com> | 2018-03-05 09:30:57 +0000 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2018-03-05 13:55:35 +0200 |
commit | 895de9d265b6167b539d4d1ed213d5c2f7e56956 (patch) | |
tree | 7094e7b80a45b37d65f886cfe56720cad32bd61c /recipes-core/openjdk | |
parent | 1a5e8d816de76f7ebcdc29e755448a4836190249 (diff) | |
download | meta-java-895de9d265b6167b539d4d1ed213d5c2f7e56956.tar.gz |
openjdk-8: rework do_patch (pt 2 - use bitbake variable overrides)
This currently uses a hand-crafted solution to distinguish
between common, native-only and and target-only patches.
That is a bit hard to follow as patches are being applied in
strange order, and is also non-standard.
Instead, we can just use bitbake variable overrides. This
makes it much easier to work with this recipe, as:
* it is clear in which order patches are going to be applied by
looking at the recipe
* it is clear which patches are meant to be common, for build,
or target
* old patches that are still lying around in WORKDIR (e.g.
because rm_work is not enabled), but that have been removed
from SRC_URI are no longer incorrectly applied
* if patches fail to apply, we know exactly which patch has
failed
* we can use PATCHTOOL = without any ill effects
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 10 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 14 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-162b12.inc | 23 |
3 files changed, 18 insertions, 29 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index cf14be9..dbdd053 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -155,16 +155,6 @@ def jdk_configure_options(d): | |||
155 | do_unpack[postfuncs] += "do_unpack_extract_submodules" | 155 | do_unpack[postfuncs] += "do_unpack_extract_submodules" |
156 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_remove_X11_wrappers', d)}" | 156 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_remove_X11_wrappers', d)}" |
157 | 157 | ||
158 | do_patch_openjdk8() { | ||
159 | olddir=`pwd` | ||
160 | cd "${S}" | ||
161 | for OJ8P in ${WORKDIR}/openjdk8-*.patch; do | ||
162 | patch -p0 < ${OJ8P} | ||
163 | done | ||
164 | } | ||
165 | |||
166 | do_patch[postfuncs] += "do_patch_openjdk8" | ||
167 | |||
168 | do_configure_prepend() { | 158 | do_configure_prepend() { |
169 | export ${@jdk_environment_options(d)} | 159 | export ${@jdk_environment_options(d)} |
170 | } | 160 | } |
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 65e3a98..3973fcf 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -1,20 +1,6 @@ | |||
1 | JDK_HOME = "${libdir_jvm}/openjdk-8" | 1 | JDK_HOME = "${libdir_jvm}/openjdk-8" |
2 | JRE_HOME = "${libdir_jvm}/openjre-8" | 2 | JRE_HOME = "${libdir_jvm}/openjre-8" |
3 | 3 | ||
4 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch | ||
5 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html | ||
6 | # by Roman Kennke (rkennke at redhat.com) | ||
7 | PATCHES_URI_append = "\ | ||
8 | file://openjdk8-restrict-to-staging-dir.patch;apply=no \ | ||
9 | file://openjdk8-fix-shark-build.patch;apply=no \ | ||
10 | file://openjdk8-fix-shark-stdc++11.patch;apply=no \ | ||
11 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ | ||
12 | file://openjdk8-fix-adlc-flags.patch;apply=no \ | ||
13 | file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ | ||
14 | file://openjdk8-add-missing-linker-flags.patch;apply=no \ | ||
15 | file://openjdk8-fix-libpng-neon-build.patch;apply=no \ | ||
16 | " | ||
17 | |||
18 | DEPENDS = "\ | 4 | DEPENDS = "\ |
19 | openjdk-8-native zip-native ant-native libxslt \ | 5 | openjdk-8-native zip-native ant-native libxslt \ |
20 | jpeg libpng krb5 libffi fontconfig freetype \ | 6 | jpeg libpng krb5 libffi fontconfig freetype \ |
diff --git a/recipes-core/openjdk/openjdk-8-release-162b12.inc b/recipes-core/openjdk/openjdk-8-release-162b12.inc index c8f6ad1..b7e6392 100644 --- a/recipes-core/openjdk/openjdk-8-release-162b12.inc +++ b/recipes-core/openjdk/openjdk-8-release-162b12.inc | |||
@@ -1,11 +1,24 @@ | |||
1 | PATCHES_URI="\ | 1 | PATCHES_URI = "\ |
2 | file://remove-shell-variables-from-autoheader.patch;striplevel=0 \ | 2 | file://remove-shell-variables-from-autoheader.patch;striplevel=0 \ |
3 | file://filter-aclocal-copy-too.patch;striplevel=0 \ | 3 | file://filter-aclocal-copy-too.patch;striplevel=0 \ |
4 | file://dont-expect-fqpn-for-make.patch;striplevel=0 \ | 4 | file://dont-expect-fqpn-for-make.patch;striplevel=0 \ |
5 | file://openjdk8-no-genx11-in-headless.patch;apply=no \ | 5 | file://openjdk8-no-genx11-in-headless.patch;striplevel=0 \ |
6 | file://openjdk8-no-unused-deps.patch;apply=no \ | 6 | file://openjdk8-no-unused-deps.patch;striplevel=0 \ |
7 | file://openjdk8-find-compiler-fix-env-respect.patch;apply=no \ | 7 | file://openjdk8-find-compiler-fix-env-respect.patch;striplevel=0 \ |
8 | file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;apply=no \ | 8 | file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;striplevel=0 \ |
9 | " | ||
10 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch | ||
11 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html | ||
12 | # by Roman Kennke (rkennke at redhat.com) | ||
13 | PATCHES_URI_append_class-target = "\ | ||
14 | file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ | ||
15 | file://openjdk8-fix-shark-build.patch;striplevel=0 \ | ||
16 | file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ | ||
17 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ | ||
18 | file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ | ||
19 | file://openjdk8-silence-d_fortify_source-warning.patch;striplevel=0 \ | ||
20 | file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ | ||
21 | file://openjdk8-fix-libpng-neon-build.patch;striplevel=0 \ | ||
9 | " | 22 | " |
10 | 23 | ||
11 | # Name of the directory containing the compiled output | 24 | # Name of the directory containing the compiled output |