summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-8-common.inc
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-03-05 09:30:57 +0000
committerMaxin B. John <maxin.john@intel.com>2018-03-05 13:55:35 +0200
commit895de9d265b6167b539d4d1ed213d5c2f7e56956 (patch)
tree7094e7b80a45b37d65f886cfe56720cad32bd61c /recipes-core/openjdk/openjdk-8-common.inc
parent1a5e8d816de76f7ebcdc29e755448a4836190249 (diff)
downloadmeta-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/openjdk-8-common.inc')
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc10
1 files changed, 0 insertions, 10 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):
155do_unpack[postfuncs] += "do_unpack_extract_submodules" 155do_unpack[postfuncs] += "do_unpack_extract_submodules"
156do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_remove_X11_wrappers', d)}" 156do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_remove_X11_wrappers', d)}"
157 157
158do_patch_openjdk8() {
159 olddir=`pwd`
160 cd "${S}"
161 for OJ8P in ${WORKDIR}/openjdk8-*.patch; do
162 patch -p0 < ${OJ8P}
163 done
164}
165
166do_patch[postfuncs] += "do_patch_openjdk8"
167
168do_configure_prepend() { 158do_configure_prepend() {
169 export ${@jdk_environment_options(d)} 159 export ${@jdk_environment_options(d)}
170} 160}